Make C++ autoconfigured toolchain the default for Linux and OS X.

This is done by adding a default workspace suffix.

--
MOS_MIGRATED_REVID=118656979

2 files changed, 3 insertions, 1 deletions

diff --git a/src/test/shell/bazel/external_correctness_test.sh b/src/test/shell/bazel/external_correctness_test.sh
index bb84579f78..4a70e16523 100755
--- a/src/test/shell/bazel/external_correctness_test.sh
+++ b/src/test/shell/bazel/external_correctness_test.sh
@@ -140,7 +140,7 @@ genrule(
 )
 EOF
   bazel build @a//b/c:echo-d &> $TEST_log || fail "Build failed"
-  assert_contains "bazel-out/local_.*-fastbuild/genfiles/external/a/b/c" \
+  assert_contains "bazel-out/local.*-fastbuild/genfiles/external/a/b/c" \
     "bazel-genfiles/external/a/b/c/d"
 }
 
diff --git a/src/test/shell/integration/testenv.sh b/src/test/shell/integration/testenv.sh
index b9baa4aa29..9326abdd4a 100755
--- a/src/test/shell/integration/testenv.sh
+++ b/src/test/shell/integration/testenv.sh
@@ -37,6 +37,8 @@ function put_bazel_on_path() {
 }
 
 function write_default_bazelrc() {
+  # Our tests use the static crosstool, so make it the default.
+  EXTRA_BAZELRC="build --crosstool_top=@bazel_tools//tools/cpp:default-toolchain"
   setup_bazelrc
 }