Merge pull request #11669 from github/redsun82/swift-wrapper

Swift: wrap extractor with shell script

Author: AlexDenisov

swift/BUILD.bazel

@@ -39,9 +39,9 @@ pkg_filegroup(
     visibility = ["//visibility:public"],
 )
 
-pkg_runfiles(
+pkg_filegroup(
     name = "extractor",
-    srcs = ["//swift/extractor"],
+    srcs = ["//swift/extractor:pkg"],
     prefix = "tools/" + codeql_platform,
 )
 

swift/extractor/BUILD.bazel

@@ -1,13 +1,13 @@
 load("//swift:rules.bzl", "swift_cc_binary")
 load("//misc/bazel/cmake:cmake.bzl", "generate_cmake")
+load("//misc/bazel:pkg_runfiles.bzl", "pkg_runfiles")
 
 swift_cc_binary(
-    name = "extractor",
+    name = "extractor.real",
     srcs = glob([
         "*.h",
         "*.cpp",
     ]),
-    visibility = ["//swift:__pkg__"],
     deps = [
         "//swift/extractor/infra",
         "//swift/extractor/invocation",
@@ -19,6 +19,19 @@ swift_cc_binary(
 
 generate_cmake(
     name = "cmake",
-    targets = [":extractor"],
+    targets = [":extractor.real"],
     visibility = ["//visibility:public"],
 )
+
+sh_binary(
+    name = "extractor",
+    srcs = ["extractor.sh"],
+    data = [":extractor.real"],
+)
+
+pkg_runfiles(
+    name = "pkg",
+    srcs = [":extractor"],
+    excludes = ["extractor.sh"],  # script gets copied as "extractor", no need for the original .sh file
+    visibility = ["//swift:__pkg__"],
+)

swift/extractor/extractor.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [[ "$(uname)" == Darwin ]]; then
+  export DYLD_FALLBACK_LIBRARY_PATH=$(dirname "$0")
+else
+  export LD_LIBRARY_PATH=$(dirname "$0")
+fi
+
+exec -a "$0" "$0.real" "$@"

swift/tools/qltest.sh

@@ -4,8 +4,6 @@ mkdir -p "$CODEQL_EXTRACTOR_SWIFT_TRAP_DIR"
 
 QLTEST_LOG="$CODEQL_EXTRACTOR_SWIFT_LOG_DIR"/qltest.log
 
-export LD_LIBRARY_PATH="$CODEQL_EXTRACTOR_SWIFT_ROOT/tools/$CODEQL_PLATFORM"
-
 EXTRACTOR="$CODEQL_EXTRACTOR_SWIFT_ROOT/tools/$CODEQL_PLATFORM/extractor"
 SDK="$CODEQL_EXTRACTOR_SWIFT_ROOT/qltest/$CODEQL_PLATFORM/sdk"