commit 50d124bb2819706ca5658fea998f4493b41bb86b
author Damien Martin-Guillerez <dmarting@google.com> Wed Jun 24 15:20:09 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Thu Jun 25 06:47:06 2015 +0000
tree b1ed728060da2dc08b93404addad0ef829ebd196
parent 4349f9435d0adb5169553d931b71c40b78c7b60a

Support the --[no]master_bazelrc flag

And get rid of usage of "blazerc" flags in our scripts.

--
MOS_MIGRATED_REVID=96776423

scripts/bootstrap/bootstrap.sh

diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
index d8fe2fa..bd5721c 100755
--- a/scripts/bootstrap/bootstrap.sh
+++ b/scripts/bootstrap/bootstrap.sh
@@ -39,12 +39,12 @@
   if [[ ! ${BAZEL_SKIP_TOOL_COMPILATION-} =~ "$2" ]]; then
     log "Building $2"
     if [ -n "${4-}" ]; then
-      ${BAZEL} --nomaster_blazerc --blazerc=${BAZELRC} \
+      ${BAZEL} --nomaster_bazelrc --bazelrc=${BAZELRC} \
           build ${BAZEL_ARGS} \
           --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \
           "${EMBED_LABEL_ARG[@]}" $1
     else
-      run_silent ${BAZEL} --nomaster_blazerc --blazerc=${BAZELRC} \
+      run_silent ${BAZEL} --nomaster_bazelrc --bazelrc=${BAZELRC} \
           build ${BAZEL_ARGS} \
           --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \
           "${EMBED_LABEL_ARG[@]}" $1
@@ -76,9 +76,9 @@
   local BAZEL_BIN=$1
   local BAZEL_SUM=$2
   [ -x "${BAZEL_BIN}" ] || fail "syntax: bootstrap bazel-binary"
-  run_silent ${BAZEL_BIN} --nomaster_blazerc --blazerc=${BAZELRC} clean \
+  run_silent ${BAZEL_BIN} --nomaster_bazelrc --bazelrc=${BAZELRC} clean \
       --expunge || return $?
-  run_silent ${BAZEL_BIN} --nomaster_blazerc --blazerc=${BAZELRC} build \
+  run_silent ${BAZEL_BIN} --nomaster_bazelrc --bazelrc=${BAZELRC} build \
       --fetch --nostamp \
       --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \
       //src:bazel //src:tools || return $?