Merge pull request #6 from CACI-International/remove-wrapper-scripts

Call compilers directly rather than use wrapper scripts

Author: calebzulawski

bazel/detail/args/BUILD

@@ -90,14 +90,14 @@ cc_args(
         '-D__DATE__="redacted"',
         '-D__TIMESTAMP__="redacted"',
         '-D__TIME__="redacted"',
-        "-ffile-prefix-map=__BAZEL_EXECUTION_ROOT__=.",
+        "-ffile-compilation-dir=.",
     ],
 )
 
 cc_args(
     name = "reproducible_link_args_apple",
     actions = ["@rules_cc//cc/toolchains/actions:link_actions"],
-    args = ["-Wl,-oso_prefix,__BAZEL_EXECUTION_ROOT__/"],
+    args = ["-Wl,-oso_prefix,."],
 )
 
 cc_args_list(

bazel/detail/tools/BUILD

@@ -46,69 +46,29 @@ TOOL = [
     "llvm-cov",
     "llvm-strip",
     "clang-tidy",
+    "clang",
+    "clang++",
+    "clang-cl",
 ]
 
+EXE_EXT = ".exe" if "windows" in HOST_TARGET else ""
+
 [
     cc_tool(
         name = tool,
-        src = select({
-            "@platforms//os:windows": "@llvm-{}//:bin/{}.exe".format(HOST_TARGET, tool),
-            "//conditions:default": "@llvm-{}//:bin/{}".format(HOST_TARGET, tool),
+        src = "@llvm-{}//:bin/{}{}".format(HOST_TARGET, tool, EXE_EXT),
+        capabilities = select({
+            "@platforms//os:windows": [
+                # "@rules_cc//cc/toolchains/capabilities:supports_dynamic_linker",
+                # "@rules_cc//cc/toolchains/capabilities:supports_interface_shared_libraries",
+                # "@rules_cc//cc/toolchains/capabilities:targets_windows",
+                # "@rules_cc//cc/toolchains/capabilities:has_configured_linker_path",
+                # "@rules_cc//cc/toolchains/capabilities:copy_dynamic_libraries_to_binary",
+            ],
+            "//conditions:default": [],
         }),
         data = ["@llvm-{}//:data".format(HOST_TARGET)],
         visibility = ["//visibility:private"],
     )
     for tool in TOOL
 ]
-
-SCRIPT_EXT = ".ps1" if "windows" in HOST_TARGET else ".sh"
-
-CALL_SCRIPT_EXT = ".bat" if "windows" in HOST_TARGET else ".sh"
-
-EXE_EXT = ".exe" if "windows" in HOST_TARGET else ""
-
-[
-    (
-        expand_template(
-            name = tool + "_wrapper",
-            out = tool + SCRIPT_EXT,
-            data = ["@llvm-{}//:bin/{}{}".format(HOST_TARGET, tool, EXE_EXT)],
-            substitutions = {
-                "{{TOOL}}": "$(execpath @llvm-{}//:bin/{}{})".format(HOST_TARGET, tool, EXE_EXT),
-            },
-            template = "wrapper" + SCRIPT_EXT,
-        ),
-        expand_template(
-            name = tool + "_bat",
-            out = tool + ".bat",
-            substitutions = {
-                "{{TOOL}}": tool,
-            },
-            template = "wrapper.bat",
-        ),
-        cc_tool(
-            name = tool,
-            src = tool + CALL_SCRIPT_EXT,
-            capabilities = select({
-                "@platforms//os:windows": [
-                    # "@rules_cc//cc/toolchains/capabilities:supports_dynamic_linker",
-                    # "@rules_cc//cc/toolchains/capabilities:supports_interface_shared_libraries",
-                    # "@rules_cc//cc/toolchains/capabilities:targets_windows",
-                    # "@rules_cc//cc/toolchains/capabilities:has_configured_linker_path",
-                    # "@rules_cc//cc/toolchains/capabilities:copy_dynamic_libraries_to_binary",
-                ],
-                "//conditions:default": [],
-            }),
-            data = [
-                "@llvm-{}//:data".format(HOST_TARGET),
-                tool + "_wrapper",
-            ],
-            visibility = ["//visibility:private"],
-        ),
-    )
-    for tool in [
-        "clang",
-        "clang++",
-        "clang-cl",
-    ]
-]