commit faf818b3f25314248400cad18c98f57c435a31b0
author gnish <gnish@google.com> Thu Apr 14 10:34:46 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 14 10:35:41 2022 -0700
tree d53dd99a4aa6c10ff9b4df00a9c39e889d3c8f34
parent 8bee70cf52c1d54e60f11b1e97c3b94acabd8aac

Fix a bug where data attribute was ignored during variable expansion.

PiperOrigin-RevId: 441797851

src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl

diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl
index 6cdc593..a3eca94 100644
--- a/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl
+++ b/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl
@@ -645,7 +645,10 @@
     # If make variable is predefined path variable(like $(location ...))
     # we will expand it first.
     if exp.find(" ") != -1:
-        return ctx.expand_location("$({})".format(exp))
+        targets = []
+        if ctx.attr.data != None:
+            targets = ctx.attr.data
+        return ctx.expand_location("$({})".format(exp), targets = targets)
 
     # Recursively expand nested make variables, but since there is no recursion
     # in Starlark we will do it via for loop.