commit 57bc201346e61c62a921c1cbf32ad24f185c10c9
author hlopko <hlopko@google.com> Wed May 16 02:15:04 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed May 16 02:16:33 2018 -0700
tree 8cfb7efab307b2f3db91d7cc4da9a0ffe6ffb5a3
parent 280175d97369a94f85f2b1df75fe5abc78640664

Do not autodetect C++ toolchain when BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 is present

This is useful e.g. when all C++ builds happen remotely and there's no C++
toolchain installed on the host machine.

Fixes #5133.

RELNOTES: None.
PiperOrigin-RevId: 196798471

tools/cpp/cc_configure.bzl

diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl
index 88c16cc..037860c 100644
--- a/tools/cpp/cc_configure.bzl
+++ b/tools/cpp/cc_configure.bzl
@@ -23,7 +23,10 @@
       Label("@bazel_tools//tools/cpp:dummy_toolchain.bzl"), "dummy_toolchain.bzl")
   env = repository_ctx.os.environ
   cpu_value = get_cpu_value(repository_ctx)
-  if cpu_value == "freebsd":
+  if "BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN" in env and env["BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN"] == "1":
+    repository_ctx.symlink(Label("@bazel_tools//tools/cpp:CROSSTOOL.empty"), "CROSSTOOL")
+    repository_ctx.symlink(Label("@bazel_tools//tools/cpp:BUILD.empty"), "BUILD")
+  elif cpu_value == "freebsd":
     # This is defaulting to the static crosstool, we should eventually
     # autoconfigure this platform too.  Theorically, FreeBSD should be
     # straightforward to add but we cannot run it in a docker container so
@@ -53,6 +56,7 @@
         "BAZEL_TARGET_LIBC",
         "BAZEL_TARGET_SYSTEM",
         "BAZEL_USE_CPP_ONLY_TOOLCHAIN",
+        "BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN",
         "BAZEL_USE_LLVM_NATIVE_COVERAGE",
         "BAZEL_VC",
         "BAZEL_VS",