diff options
author | Damien Martin-Guillerez <dmarting@google.com> | 2016-01-18 11:30:10 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@google.com> | 2016-01-18 14:34:58 +0000 |
commit | 50fce86f11f4fc5a372d008be903842576e72403 (patch) | |
tree | 079f11b04816d783e1f8a06870b512575b5dc79f /compile.sh | |
parent | 5fd0d622d14d608389a176a2f6fa2b129aec81e4 (diff) |
Inline bazel_bootstrap in compile.sh
This method is used only once now so inline.
--
MOS_MIGRATED_REVID=112396086
Diffstat (limited to 'compile.sh')
-rwxr-xr-x | compile.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/compile.sh b/compile.sh index 07492a5505..2159384b18 100755 --- a/compile.sh +++ b/compile.sh @@ -94,7 +94,23 @@ source scripts/bootstrap/bootstrap.sh if [ $DO_COMPILE ]; then new_step 'Building Bazel with Bazel' display "." - bazel_bootstrap //src:bazel output/bazel 0755 1 + log "Building output/bazel" + + ${BAZEL} --nomaster_bazelrc --bazelrc=${BAZELRC} --batch \ + build \ + --singlejar_top=//src/java_tools/singlejar:bootstrap_deploy.jar \ + --javabuilder_top=//src/java_tools/buildjar:bootstrap_deploy.jar \ + --genclass_top=//src/java_tools/buildjar:bootstrap_genclass_deploy.jar \ + --ijar_top=//third_party/ijar \ + --strategy=Javac=worker --worker_quit_after_build \ + --genrule_strategy=standalone --spawn_strategy=standalone \ + ${EXTRA_BAZEL_ARGS-} \ + --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \ + "${EMBED_LABEL_ARG[@]}" \ + //src:bazel + + cp -f bazel-bin/src/bazel output/bazel + chmod 0755 output/bazel BAZEL=$(pwd)/output/bazel fi |