Expand locations and make variables in configure options (#1102)

bazel-contrib · Oct 14, 2023 · ef3031e · ef3031e
1 parent e3003dd
commit ef3031e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/examples/third_party/apr_util/BUILD.apr_util.bazel b/examples/third_party/apr_util/BUILD.apr_util.bazel
@@ -12,8 +12,8 @@ configure_make(
     name = "apr_util",
     configure_in_place = True,
     configure_options = [
-        "--with-apr=$EXT_BUILD_DEPS/apr",
-        "--with-expat=$EXT_BUILD_DEPS/expat",
+        "--with-apr=$$EXT_BUILD_DEPS/apr",
+        "--with-expat=$$EXT_BUILD_DEPS/expat",
     ],
     env = select({
         "@platforms//os:macos": {"AR": ""},

diff --git a/examples/third_party/log4cxx/BUILD.log4cxx.bazel b/examples/third_party/log4cxx/BUILD.log4cxx.bazel
@@ -12,8 +12,8 @@ configure_make(
     name = "log4cxx",
     configure_options = [
         "--disable-shared",
-        "--with-apr=$EXT_BUILD_DEPS/apr",
-        "--with-apr-util=$EXT_BUILD_DEPS/apr_util",
+        "--with-apr=$$EXT_BUILD_DEPS/apr",
+        "--with-apr-util=$$EXT_BUILD_DEPS/apr_util",
     ],
     env = select({
         "@platforms//os:macos": {

diff --git a/examples/third_party/python/BUILD.python3.bazel b/examples/third_party/python/BUILD.python3.bazel
@@ -14,8 +14,8 @@ configure_make(
     name = "python3",
     configure_options = [
         "CFLAGS='-Dredacted=\"redacted\"'",
-        "--with-openssl=$EXT_BUILD_DEPS/openssl",
-        "--with-zlib=$EXT_BUILD_DEPS/zlib",
+        "--with-openssl=$$EXT_BUILD_DEPS/openssl",
+        "--with-zlib=$$EXT_BUILD_DEPS/zlib",
         "--enable-optimizations",
     ],
     env = select({

diff --git a/examples/third_party/subversion/BUILD.subversion.bazel b/examples/third_party/subversion/BUILD.subversion.bazel
@@ -19,9 +19,9 @@ configure_make(
     configure_options = [
         "--enable-all-static",
         "--without-boost",
-        "--with-apr=$EXT_BUILD_DEPS/apr",
-        "--with-apr-util=$EXT_BUILD_DEPS/apr_util",
-        "--with-zlib=$EXT_BUILD_DEPS/zlib",
+        "--with-apr=$$EXT_BUILD_DEPS/apr",
+        "--with-apr-util=$$EXT_BUILD_DEPS/apr_util",
+        "--with-zlib=$$EXT_BUILD_DEPS/zlib",
         "--with-lz4=internal",
         "--with-utf8proc=internal",
         "--enable-optimize",

diff --git a/foreign_cc/configure.bzl b/foreign_cc/configure.bzl
@@ -76,6 +76,7 @@ def _create_configure_script(configureParameters):
     make_commands = []
     prefix = "{} ".format(expand_locations_and_make_variables(ctx, attrs.tool_prefix, "tool_prefix", data)) if attrs.tool_prefix else ""
     configure_prefix = "{} ".format(expand_locations_and_make_variables(ctx, ctx.attr.configure_prefix, "configure_prefix", data)) if ctx.attr.configure_prefix else ""
+    configure_options = [expand_locations_and_make_variables(ctx, option, "configure_option", data) for option in ctx.attr.configure_options] if ctx.attr.configure_options else []
 
     for target in ctx.attr.targets:
         # Configure will have generated sources into `$BUILD_TMPDIR` so make sure we `cd` there
@@ -91,7 +92,7 @@ def _create_configure_script(configureParameters):
         tools = tools,
         flags = flags,
         root = detect_root(ctx.attr.lib_source),
-        user_options = ctx.attr.configure_options,
+        user_options = configure_options,
         configure_prefix = configure_prefix,
         configure_command = ctx.attr.configure_command,
         deps = ctx.attr.deps,