feat: Expand locations and make variables in extra_args

Signed-off-by: Fabian Meumertzheim <fabian@meumertzhe.im>
sgammon · Apr 30, 2024 · 0e98ad9 · 0e98ad9
1 parent 629ebb1
commit 0e98ad9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/internal/native_image/builder.bzl b/internal/native_image/builder.bzl
@@ -262,4 +262,13 @@ def assemble_native_build_options(
 
     # append extra arguments last
     for arg in ctx.attr.extra_args:
-        args.add(arg)
+        # Expand locations of targets in 'data' and make variables provided by 'toolchains'.
+        expanded_arg = ctx.expand_make_variables(
+            "extra_args",
+            ctx.expand_location(arg, ctx.attr.data),
+            {},
+        )
+
+        # Skip over args that become empty after expansion but weren't before.
+        if expanded_arg or not arg:
+            args.add(expanded_arg)