Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,13 @@ use_repo(
swift,
"swift_toolchain",
"swift_toolchain_ubuntu22.04",
"swift_toolchain_ubuntu22.04-aarch64",
"swift_toolchain_xcode",
)

register_toolchains(
"@swift_toolchain//:swift_toolchain_exec_ubuntu22.04",
"@swift_toolchain//:swift_toolchain_exec_ubuntu22.04-aarch64",
"@swift_toolchain//:swift_toolchain_exec_xcode",
dev_dependency = True,
)
Expand Down
2 changes: 1 addition & 1 deletion unified/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ codeql_pkg_files(
name = "extractor-arch",
exes = codeql_platform_select(
linux64 = ["//unified/extractor"],
linux_arm64 = ["//unified/extractor-unsupported-os:extractor"],
linux_arm64 = ["//unified/extractor"],

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair, but these are broken all over the place. We should probably find a way to get rid of most or all of them.

osx64 = ["//unified/extractor"],
win64 = ["//unified/extractor-unsupported-os:extractor"],
Comment on lines 44 to 48

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at this point we can simplify to

    exes = codeql_platform_select(
        win64 = ["//unified/extractor-unsupported-os:extractor"],
        otherwise = ["//unified/extractor"],
    ),

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me get this merged and do a small follow-up.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

),
Expand Down
Loading