Swift: fix legacy extractor-pack-arch target

Author: redsun82

swift/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup")
+load("//:defs.bzl", "codeql_platform")
 load(
     "//misc/bazel:pkg.bzl",
     "codeql_pack",
@@ -91,15 +92,28 @@ alias(
     actual = ":swift-installer",
 )
 
-# TODO: aliases for internal repo backward compatibility
+# TODO: following rules are for internal repo backward compatibility only
 alias(
     name = "extractor-pack-generic",
     actual = "swift-generic",
     visibility = ["//visibility:public"],
 )
 
-alias(
+pkg_filegroup(
+    name = "resource-dir",
+    srcs = select({
+        "@platforms//os:linux": ["@swift_toolchain_linux//:resource-dir-files"],
+        "@platforms//os:macos": ["@swift_toolchain_macos//:resource-dir-files"],
+        "@platforms//os:windows": [],
+    }),
+    prefix = "resource-dir/" + codeql_platform,
+)
+
+pkg_filegroup(
     name = "extractor-pack-arch",
-    actual = "swift-arch",
+    srcs = [
+        ":resource-dir",
+        ":swift-arch",
+    ],
     visibility = ["//visibility:public"],
 )

swift/third_party/BUILD.swift-toolchain-linux.bazel

@@ -1,4 +1,4 @@
-load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
 load("@rules_pkg//pkg:pkg.bzl", "pkg_zip")
 
 _strip_prefix = "usr/lib/swift"
@@ -43,9 +43,15 @@ _pm_interface_files = [
     for dir, interface, module in _pm_interface_files
 ]
 
+pkg_filegroup(
+    name = "resource-dir-files",
+    srcs = [":resource-dir-original"] + [":pkg-%s" % module for _, _, module in _pm_interface_files],
+    visibility = ["//visibility:public"],
+)
+
 pkg_zip(
     name = "resource-dir-linux",
-    srcs = [":resource-dir-original"] + [":pkg-%s" % module for _, _, module in _pm_interface_files],
+    srcs = [":resource-dir-files"],
 )
 
 alias(

swift/third_party/BUILD.swift-toolchain-macos.bazel

@@ -9,6 +9,7 @@ pkg_files(
         ["usr/lib/swift/**/*"],
     ),
     strip_prefix = _strip_prefix,
+    visibility = ["//visibility:public"],
 )
 
 pkg_zip(