From 1a3750b352c9091909f0493f7eb3764c490e0851 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <93738568+jketema@users.noreply.github.com>
Date: Tue, 1 Sep 2026 12:38:47 +0000
Subject: [PATCH 1/2] Unified: simplify Bazel build

---
 unified/BUILD.bazel | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/unified/BUILD.bazel b/unified/BUILD.bazel
index bde1d88a9d49..ece7381dc930 100644
--- a/unified/BUILD.bazel
+++ b/unified/BUILD.bazel
@@ -42,10 +42,8 @@ codeql_pkg_files(
 codeql_pkg_files(
     name = "extractor-arch",
     exes = codeql_platform_select(
-        linux64 = ["//unified/extractor"],
-        linux_arm64 = ["//unified/extractor"],
-        osx64 = ["//unified/extractor"],
         win64 = ["//unified/extractor-unsupported-os:extractor"],
+        otherwise = ["//unified/extractor"],
     ),
     prefix = "tools/{CODEQL_PLATFORM}",
 )

From e8c6fafe0f024771ed9878db580641895357828c Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <93738568+jketema@users.noreply.github.com>
Date: Tue, 1 Sep 2026 12:43:40 +0000
Subject: [PATCH 2/2] Unified: fix formatting

---
 unified/BUILD.bazel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unified/BUILD.bazel b/unified/BUILD.bazel
index ece7381dc930..55bf87e8e38b 100644
--- a/unified/BUILD.bazel
+++ b/unified/BUILD.bazel
@@ -42,8 +42,8 @@ codeql_pkg_files(
 codeql_pkg_files(
     name = "extractor-arch",
     exes = codeql_platform_select(
-        win64 = ["//unified/extractor-unsupported-os:extractor"],
         otherwise = ["//unified/extractor"],
+        win64 = ["//unified/extractor-unsupported-os:extractor"],
     ),
     prefix = "tools/{CODEQL_PLATFORM}",
 )