commit bcbdb87bb8ee131fbd9631b84b4112843422915f
author Nicolas Lopez <ngiraldo@google.com> Tue Mar 28 08:08:50 2017 +0000
committer Philipp Wollermann <philwo@google.com> Tue Mar 28 19:50:12 2017 +0000
tree 9b3e74071b54dbe6f21a20e95d9750172589dc45
parent 70a8d3580b3c04b7e72fec9412e1d61b1e478020

Replacing hardcoded use of 'local' for env variables in cc autoconfig

--
Change-Id: Ic1632229e67bf82b69983f9614258c5fd54c12d8
Reviewed-on: https://cr.bazel.build/9390
PiperOrigin-RevId: 151422502
MOS_MIGRATED_REVID=151422502

tools/cpp/cc_configure.bzl

diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl
index eddf060..8abed7e 100644
--- a/tools/cpp/cc_configure.bzl
+++ b/tools/cpp/cc_configure.bzl
@@ -212,11 +212,11 @@
   """Return the content for the CROSSTOOL file, in a dictionary."""
   supports_gold_linker = _is_gold_supported(repository_ctx, cc)
   return {
-      "abi_version": "local",
-      "abi_libc_version": "local",
+      "abi_version": _get_env_var(repository_ctx, "ABI_VERSION", "local"),
+      "abi_libc_version": _get_env_var(repository_ctx, "ABI_LIBC_VERSION", "local"),
       "builtin_sysroot": "",
-      "compiler": "compiler",
-      "host_system_name": "local",
+      "compiler": _get_env_var(repository_ctx, "BAZEL_COMPILER", "compiler"),
+      "host_system_name": _get_env_var(repository_ctx, "BAZEL_HOST_SYSTEM", "local"),
       "needsPic": True,
       "supports_gold_linker": supports_gold_linker,
       "supports_incremental_linker": False,
@@ -224,9 +224,9 @@
       "supports_interface_shared_objects": False,
       "supports_normalizing_ar": False,
       "supports_start_end_lib": supports_gold_linker,
-      "target_libc": "macosx" if darwin else "local",
-      "target_cpu": cpu_value,
-      "target_system_name": "local",
+      "target_libc": "macosx" if darwin else _get_env_var(repository_ctx, "BAZEL_TARGET_LIBC", "local"),
+      "target_cpu": _get_env_var(repository_ctx, "BAZEL_TARGET_CPU", cpu_value),
+      "target_system_name": _get_env_var(repository_ctx, "BAZEL_TARGET_SYSTEM", "local"),
       "cxx_flag": [
           "-std=c++0x",
       ] + _cplus_include_paths(repository_ctx),
@@ -732,6 +732,7 @@
         "%{name}": cpu_value,
         "%{supports_param_files}": "0" if darwin else "1",
         "%{cc_compiler_deps}": ":cc_wrapper" if darwin else ":empty",
+        "%{compiler}": _get_env_var(repository_ctx, "BAZEL_COMPILER", "compiler"),
     })
     _tpl(repository_ctx,
         "osx_cc_wrapper.sh" if darwin else "linux_cc_wrapper.sh",
@@ -739,8 +740,8 @@
         "cc_wrapper.sh")
     _tpl(repository_ctx, "CROSSTOOL", {
         "%{cpu}": cpu_value,
-        "%{default_toolchain_name}": "local",
-        "%{toolchain_name}": "local",
+        "%{default_toolchain_name}": _get_env_var(repository_ctx, "CC_TOOLCHAIN_NAME", "local"),
+        "%{toolchain_name}": _get_env_var(repository_ctx, "CC_TOOLCHAIN_NAME", "local"),
         "%{content}": _build_crosstool(crosstool_content) + "\n" +
                       _build_tool_path(tool_paths),
         "%{opt_content}": _build_crosstool(opt_content, "    "),
@@ -753,11 +754,19 @@
 cc_autoconf = repository_rule(
     implementation=_impl,
     environ = [
-        "CC",
+        "ABI_LIBC_VERSION",
+        "ABI_VERSION",
+        "BAZEL_COMPILER",
+        "BAZEL_HOST_SYSTEM",
+        "BAZEL_PYTHON",
+        "BAZEL_SH",
+        "BAZEL_TARGET_CPU",
+        "BAZEL_TARGET_LIBC",
+        "BAZEL_TARGET_SYSTEM",
         "BAZEL_VC",
         "BAZEL_VS",
-        "BAZEL_SH",
-        "BAZEL_PYTHON",
+        "CC",
+        "CC_TOOLCHAIN_NAME",
         "CPLUS_INCLUDE_PATH"])