diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-04-20 22:14:57 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-04-21 11:02:24 +0000 |
| commit | 70b001968e15a865cac7b6bc8552f74af005eb2c (patch) | |
| tree | c64180c127839778c4263fbc2467dd40044f83ca /scripts | |
| parent | baeba8b286f9fef8c5a0dcd55086855626f27735 (diff) | |
Fix Bazel JDK 7 build
Once and for all, I tested it and re-tested should
be good.
--
MOS_MIGRATED_REVID=120381352
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap/bootstrap.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh index 8732d98aca..d567b0dbc2 100755 --- a/scripts/bootstrap/bootstrap.sh +++ b/scripts/bootstrap/bootstrap.sh @@ -82,12 +82,15 @@ function bootstrap_test() { local BAZEL_BIN=$1 local BAZEL_SUM=$2 local BAZEL_TARGET=${3:-src:bazel} + local STRATEGY="--strategy=Javac=worker --worker_quit_after_build" + if [ "${JAVA_VERSION}" = "1.7" ]; then + STRATEGY= + fi [ -x "${BAZEL_BIN}" ] || fail "syntax: bootstrap bazel-binary" run ${BAZEL_BIN} --nomaster_bazelrc --bazelrc=${BAZELRC} clean \ --expunge || return $? run ${BAZEL_BIN} --nomaster_bazelrc --bazelrc=${BAZELRC} build \ - ${EXTRA_BAZEL_ARGS-} \ - --strategy=Javac=worker --worker_quit_after_build \ + ${EXTRA_BAZEL_ARGS-} ${STRATEGY} \ --fetch --nostamp \ --define "JAVA_VERSION=${JAVA_VERSION}" \ --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \ |