commit 7c507bebbfc53225d54db07e2f2098054652f4f7
author Peter Schmitt <schmitt@google.com> Mon Nov 23 14:45:24 2015 +0000
committer Philipp Wollermann <philwo@google.com> Tue Nov 24 14:40:47 2015 +0000
tree 6a1a5ba376a26d7c6ed2228771ce6c21f6c175fc
parent 1b2e3e3152b0f2311606db25fbefc5ce78b9db83

Allow specification of bazel target for bootstrap.

--
MOS_MIGRATED_REVID=108500888

scripts/bootstrap/bootstrap.sh

diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
index 11debd8..2ffae0d 100755
--- a/scripts/bootstrap/bootstrap.sh
+++ b/scripts/bootstrap/bootstrap.sh
@@ -77,6 +77,7 @@
 function bootstrap_test() {
   local BAZEL_BIN=$1
   local BAZEL_SUM=$2
+  local BAZEL_TARGET=${3:-//src:bazel}
   [ -x "${BAZEL_BIN}" ] || fail "syntax: bootstrap bazel-binary"
   run_silent ${BAZEL_BIN} --nomaster_bazelrc --bazelrc=${BAZELRC} clean \
       --expunge || return $?
@@ -84,7 +85,7 @@
       ${BAZEL_ARGS} \
       --fetch --nostamp \
       --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \
-      //src:bazel || return $?
+      ${BAZEL_TARGET} || return $?
   if [ -n "${BAZEL_SUM}" ]; then
     cat bazel-genfiles/src/java.version >${BAZEL_SUM}
     get_outputs_sum >> ${BAZEL_SUM} || return $?
@@ -92,7 +93,8 @@
   if [ -z "${BOOTSTRAP:-}" ]; then
     tempdir
     BOOTSTRAP=${NEW_TMPDIR}/bazel
-    cp -f bazel-bin/src/bazel $BOOTSTRAP
+    local FILE=bazel-bin/${BAZEL_TARGET##//}
+    cp -f ${FILE/:/\/} $BOOTSTRAP
     chmod +x $BOOTSTRAP
   fi
 }