Re-enable bootclasspath optimization.

technomancy · Feb 11, 2019 · c0eb388 · c0eb388
1 parent 8a981b9
commit c0eb388
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,7 @@
 
 ## 2.9.0 / 2019-02-10
 
+* Re-enable bootclasspath optimization by default. (Phil Hagelberg)
 * Sort namespace order consistently during AOT. (Logan Girard)
 * Use Clojure 1.10.0 for plugins and new templates projects. (Alex Miller, Phil Hagelberg)
 

diff --git a/bin/lein b/bin/lein
@@ -213,7 +213,7 @@ if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
 else # Not running from a checkout
     add_path CLASSPATH "$LEIN_JAR"
 
-    if [ "$LEIN_USE_BOOTCLASSPATH" != "" ]; then
+    if [ "$LEIN_USE_BOOTCLASSPATH" != "no" ]; then
         LEIN_JVM_OPTS="-Xbootclasspath/a:$LEIN_JAR $LEIN_JVM_OPTS"
     fi
 

diff --git a/bin/lein-pkg b/bin/lein-pkg
@@ -50,7 +50,7 @@ if ! { [ "$1" = "compile" ] &&
         grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
             project.clj ;}; then
     CLASSPATH="$CLASSPATH":"$LEIN_JAR"
-    if [ "$LEIN_USE_BOOTCLASSPATH" != "" ]; then
+    if [ "$LEIN_USE_BOOTCLASSPATH" != "no" ]; then
         LEIN_JVM_OPTS="-Xbootclasspath/a:$LEIN_JAR $LEIN_JVM_OPTS"
     fi
 fi

diff --git a/bin/lein-sdkman b/bin/lein-sdkman
@@ -107,7 +107,7 @@ grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null && \
 
 add_path CLASSPATH "$LEIN_JAR"
 
-if [ "$LEIN_USE_BOOTCLASSPATH" != "" ]; then
+if [ "$LEIN_USE_BOOTCLASSPATH" != "no" ]; then
     LEIN_JVM_OPTS="-Xbootclasspath/a:$LEIN_JAR $LEIN_JVM_OPTS"
 fi