aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorGravatar lberki <lberki@google.com>2017-10-11 11:42:53 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-10-11 13:57:52 +0200
commit2ea4fa26281175c316651ec50784b820a9f409cf (patch)
treee368fddc3a18f0832e5556ca75fcec9698f903e5 /scripts
parent0a63dadf4eafbae1730f88644b0c537fb1c16d5c (diff)
Remove support for --javabase=<absolute path>.
If an absolute javabase is desired, the following set of rules can be used: java_runtime_suite(name="suite", default=":runtime") java_runtime(name="runtime", java_home=<path to the JDK>) Then --javabase can be pointed to the java_runtime_suite() rule. Alternatively, the java_runtime rule can reference a Make variable: java_runtime(name="runtime", java_home="$(ABSOLUTE_JAVABASE)") Then the Javabase can be specified on the command line like this: --javabase=<your package>:suite --define=ABSOLUTE_JAVABASE=<path to the JDK> RELNOTES[INC]: --javabase=<absolute path> and --host_javabase=<absolute path> are not supported anymore. If you need this functionality java_runtime_suite(name="suite", default=":runtime") java_runtime(name="runtime", java_home=<path to the JDK>) is an alternative. PiperOrigin-RevId: 171798416
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bootstrap/bootstrap.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
index eeac8d1d20..3f8ba74da2 100755
--- a/scripts/bootstrap/bootstrap.sh
+++ b/scripts/bootstrap/bootstrap.sh
@@ -58,7 +58,6 @@ if [ -z "${BAZEL-}" ]; then
shift
run_bazel_jar $command \
${_BAZEL_ARGS} --verbose_failures \
- "--javabase=${JAVA_HOME}" "--host_javabase=${JAVA_HOME}" \
--javacopt="-g -source ${JAVA_VERSION} -target ${JAVA_VERSION}" "${@}"
}
else
@@ -67,7 +66,6 @@ else
shift
${BAZEL} --bazelrc=${BAZELRC} ${BAZEL_DIR_STARTUP_OPTIONS} $command \
${_BAZEL_ARGS} --verbose_failures \
- "--javabase=${JAVA_HOME}" "--host_javabase=${JAVA_HOME}" \
--javacopt="-g -source ${JAVA_VERSION} -target ${JAVA_VERSION}" "${@}"
}
fi