diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-01-18 15:58:19 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2016-01-18 16:52:06 +0000 |
| commit | 5ed789526c0754f6b5f47d1bd1f4b20e6a239000 (patch) | |
| tree | 0134b565eea02d860caa41b24b60e2e0f8f01c1d /scripts | |
| parent | 9a9c3b93f9eefdfa166f24a893d51d8d4abc8d3a (diff) | |
Fix Bazel bootstrapping with JDK 7
With latest change to the bootstrap compilation, some options
were wrongly moved around.
Tested with `source scripts/ci/build.sh; bazel_build` for JAVA_VERSION
1.7 and 1.8.
--
MOS_MIGRATED_REVID=112409496
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap/bootstrap.sh | 12 | ||||
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh index a780f78ce6..16a13c9042 100755 --- a/scripts/bootstrap/bootstrap.sh +++ b/scripts/bootstrap/bootstrap.sh @@ -30,9 +30,17 @@ fi : ${JAVA_VERSION:="1.8"} +: ${BAZEL_ARGS:=--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:-}"} + if [ -z "${BAZEL-}" ]; then function bazel_build() { - bootstrap_build ${EXTRA_BAZEL_ARGS-} \ + bootstrap_build ${BAZEL_ARGS-} \ --verbose_failures \ --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \ "${EMBED_LABEL_ARG[@]}" \ @@ -41,7 +49,7 @@ if [ -z "${BAZEL-}" ]; then else function bazel_build() { ${BAZEL} --bazelrc=${BAZELRC} build \ - ${EXTRA_BAZEL_ARGS-} \ + ${BAZEL_ARGS-} \ --verbose_failures \ --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \ "${EMBED_LABEL_ARG[@]}" \ diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index c1d0841b40..461c207e58 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -231,12 +231,5 @@ function bootstrap_build() { --rc_source=/dev/null --isatty=1 --terminal_columns=97 \ --ignore_client_env \ --client_cwd=${PWD} \ - \ - --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 \ "${@}" } |