commit be5b2ebcf70b5e89cb87060cee045a9773b496f4
author Damien Martin-Guillerez <dmarting@google.com> Wed Mar 02 16:08:07 2016 +0000
committer Kristina Chodorow <kchodorow@google.com> Wed Mar 02 17:55:40 2016 +0000
tree 63b66c2a46101cc07744d4a2cbf8e8a9e10010b4
parent a49f02536ef62ddf6ef5a17b0f7c1a35aaf81098

Use bind to redirect C++ crosstool configuration

This is a temporary workaround to enable the use
of a cc_configure() rules to auto-configure C++ toolchain.

--
MOS_MIGRATED_REVID=116140726

scripts/bootstrap/compile.sh

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index e585719..b7a5f3f 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -169,8 +169,10 @@
   done
 
   # Overwrite tools.WORKSPACE, this is only for the bootstrap binary
-  echo "local_repository(name = 'bazel_tools', path = __workspace_dir__)" \
-       > ${OUTPUT_DIR}/classes/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE
+  cat <<EOF >${OUTPUT_DIR}/classes/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE
+local_repository(name = 'bazel_tools', path = __workspace_dir__)
+bind(name = "cc_toolchain", actual = "@bazel_tools//tools/cpp:default-toolchain")
+EOF
 
   create_deploy_jar "libblaze" "com.google.devtools.build.lib.bazel.BazelMain" \
       ${OUTPUT_DIR}