diff options
| -rwxr-xr-x | compile.sh | 17 | ||||
| -rwxr-xr-x | scripts/bootstrap/bootstrap.sh | 1 |
2 files changed, 8 insertions, 10 deletions
diff --git a/compile.sh b/compile.sh index dbf75bbe00..56ca3da74a 100755 --- a/compile.sh +++ b/compile.sh @@ -89,16 +89,6 @@ if [ "${EMBED_LABEL-x}" = "x" ]; then fi source scripts/bootstrap/bootstrap.sh -if [ $DO_COMPILE ]; then - new_step 'Building Bazel with Bazel' - display "." - bazel_bootstrap //src:bazel output/bazel 0755 1 - BAZEL=$(pwd)/output/bazel -fi - -# -# Bootstrap tools using the release binary -# if [ $DO_TOOLS_COMPILATION ]; then new_step 'Building Bazel tools' bazel_bootstrap //third_party/ijar:ijar tools/jdk/ijar 0755 @@ -129,6 +119,13 @@ if [ $DO_TOOLS_COMPILATION ]; then fi fi +if [ $DO_COMPILE ]; then + new_step 'Building Bazel with Bazel' + display "." + bazel_bootstrap //src:bazel output/bazel 0755 1 + BAZEL=$(pwd)/output/bazel +fi + # # Output is deterministic between two bootstrapped bazel binary using the actual tools and the # released binary. diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh index 5e073de360..b153bad636 100755 --- a/scripts/bootstrap/bootstrap.sh +++ b/scripts/bootstrap/bootstrap.sh @@ -80,6 +80,7 @@ function bootstrap_test() { run_silent ${BAZEL_BIN} --nomaster_bazelrc --bazelrc=${BAZELRC} clean \ --expunge || return $? run_silent ${BAZEL_BIN} --nomaster_bazelrc --bazelrc=${BAZELRC} build \ + ${BAZEL_ARGS} \ --fetch --nostamp \ --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \ //src:bazel || return $? |