aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorMarcelo Vanzin <vanzin@cloudera.com>2016-05-31 16:54:34 -0700
committerMarcelo Vanzin <vanzin@cloudera.com>2016-05-31 16:54:34 -0700
commit57adb77e6b0208dc6d29488a674b6ad78702262f (patch)
tree2de7dfa2f3b62bccc3a8417d1fba69db5cecf24f /build
parent90b11439b3d4540f48985e87dcc99749f0369287 (diff)
downloadspark-57adb77e6b0208dc6d29488a674b6ad78702262f.tar.gz
spark-57adb77e6b0208dc6d29488a674b6ad78702262f.tar.bz2
spark-57adb77e6b0208dc6d29488a674b6ad78702262f.zip
[SPARK-15451][BUILD] Use jdk7's rt.jar when available.
This helps with preventing jdk8-specific calls being checked in, because PR builders are running the compiler with the wrong settings. If the JAVA_7_HOME env variable is set, assume it points at a jdk7 and use its rt.jar when invoking javac. For zinc, just run it with jdk7, and disable it when building jdk8-specific code. A big note for sbt usage: adding the bootstrap options forces sbt to fork the compiler, and that disables incremental compilation. That means that it's really not convenient to use for normal development, but should be ok for automated builds. Tested with JAVA_HOME=jdk8 and JAVA_7_HOME=jdk7: - mvn + zinc - mvn sans zinc - sbt Verified that in all cases, jdk8-specific library calls fail to compile. Author: Marcelo Vanzin <vanzin@cloudera.com> Closes #13272 from vanzin/SPARK-15451.
Diffstat (limited to 'build')
-rwxr-xr-xbuild/mvn6
1 files changed, 5 insertions, 1 deletions
diff --git a/build/mvn b/build/mvn
index a78b93a685..c3ab62da36 100755
--- a/build/mvn
+++ b/build/mvn
@@ -141,9 +141,13 @@ cd "${_CALLING_DIR}"
# Now that zinc is ensured to be installed, check its status and, if its
# not running or just installed, start it
if [ -n "${ZINC_INSTALL_FLAG}" -o -z "`"${ZINC_BIN}" -status -port ${ZINC_PORT}`" ]; then
+ ZINC_JAVA_HOME=
+ if [ -n "$JAVA_7_HOME" ]; then
+ ZINC_JAVA_HOME="env JAVA_HOME=$JAVA_7_HOME"
+ fi
export ZINC_OPTS=${ZINC_OPTS:-"$_COMPILE_JVM_OPTS"}
"${ZINC_BIN}" -shutdown -port ${ZINC_PORT}
- "${ZINC_BIN}" -start -port ${ZINC_PORT} \
+ $ZINC_JAVA_HOME "${ZINC_BIN}" -start -port ${ZINC_PORT} \
-scala-compiler "${SCALA_COMPILER}" \
-scala-library "${SCALA_LIBRARY}" &>/dev/null
fi