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
16 changes: 9 additions & 7 deletions unified/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup")
load("//misc/bazel:os.bzl", "codeql_platform_select")
load("//misc/bazel:pkg.bzl", "codeql_pack", "codeql_pkg_files")
load("//misc/bazel:utils.bzl", "select_os")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -41,12 +41,14 @@ codeql_pkg_files(

codeql_pkg_files(
name = "extractor-arch",
exes = select_os(
posix = ["//unified/extractor"],
windows = ["//unified/extractor-unsupported-os:extractor"],
) + select_os(
linux = ["//unified/swift-syntax-rs:swift_runtime_libs"],
otherwise = [],
exes = codeql_platform_select(
linux64 = [
"//unified/extractor",
"//unified/swift-syntax-rs:swift_runtime_libs",
],
linux_arm64 = ["//unified/extractor-unsupported-os:extractor"],

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.

We indeed might want to update the message.

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.

Done

osx64 = ["//unified/extractor"],
win64 = ["//unified/extractor-unsupported-os:extractor"],
),
prefix = "tools/{CODEQL_PLATFORM}",
)
Expand Down
2 changes: 1 addition & 1 deletion unified/extractor-unsupported-os/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fn main() {
eprintln!("Unsupported OS. Extraction is not currently supported on Windows.");
eprintln!("Unsupported OS. Extraction is not currently supported on this platform.");
std::process::exit(1);
}
Loading