Commit cb6500a 1 parent f19d610 commit cb6500a Copy full SHA for cb6500a
File tree 3 files changed +3
-6
lines changed
3 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -36,9 +36,6 @@ _BAZEL_ARGS="--spawn_strategy=standalone \
36
36
--strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \
37
37
--compilation_mode=opt \
38
38
--distdir=derived/distdir \
39
- --java_toolchain=//scripts/bootstrap:bootstrap_toolchain \
40
- --host_java_toolchain=//scripts/bootstrap:bootstrap_toolchain \
41
- --incompatible_use_toolchain_resolution_for_java_rules \
42
39
--extra_toolchains=//scripts/bootstrap:bootstrap_toolchain_definition \
43
40
${DIST_BOOTSTRAP_ARGS:- } \
44
41
${EXTRA_BAZEL_ARGS:- } "
Original file line number Diff line number Diff line change @@ -212,7 +212,7 @@ sudo apt-get install build-essential openjdk-11-jdk python zip unzip
212
212
213
213
3 . ` cd ` to the directory where you unpacked the distribution archive.
214
214
215
- 3 . Run the compilation script: ` env EXTRA_BAZEL_ARGS="--host_javabase=@ local_jdk//:jdk " bash ./compile.sh ` .
215
+ 3 . Run the compilation script: ` env EXTRA_BAZEL_ARGS="--tool_java_runtime_version= local_jdk" bash ./compile.sh ` .
216
216
217
217
The compiled output is placed into ` output/bazel ` . This is a self-contained
218
218
Bazel binary, without an embedded JDK. You can copy it anywhere or use it
@@ -283,7 +283,7 @@ Unix-like systems.)
283
283
284
284
3. `cd` to the directory where you unpacked the distribution archive.
285
285
286
- 4. Run the compilation script: `env EXTRA_BAZEL_ARGS="--host_javabase=@ local_jdk//:jdk " ./compile.sh`
286
+ 4. Run the compilation script: `env EXTRA_BAZEL_ARGS="--tool_java_runtime_version= local_jdk" ./compile.sh`
287
287
288
288
The compiled output is placed into `output/bazel.exe`. This is a self-contained
289
289
Bazel binary, without an embedded JDK. You can copy it anywhere or use it
Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ function test_bootstrap() {
102
102
103
103
JAVABASE=$( echo reduced* )
104
104
105
- env EXTRA_BAZEL_ARGS=" --host_javabase=@local_jdk//:jdk -- tool_java_runtime_version=local_jdk" ./compile.sh \
105
+ env EXTRA_BAZEL_ARGS=" --tool_java_runtime_version=local_jdk" ./compile.sh \
106
106
|| fail " Expected to be able to bootstrap bazel"
107
107
./output/bazel \
108
108
--server_javabase=$JAVABASE --host_jvm_args=--add-opens=java.base/java.nio=ALL-UNNAMED \
You can’t perform that action at this time.
0 commit comments