aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2004-08-18 15:06:03 +0800
committerglewis <glewis@FreeBSD.org>2004-08-18 15:06:03 +0800
commitd656889d50b308a41c6efd1e482a88c890d3f1cc (patch)
treeab5d93b55745f0000de3e7458d3e1a0b4ba80ecc
parent7be1b69b2b54597afdaae0088cdd22e984763897 (diff)
downloadfreebsd-ports-gnome-d656889d50b308a41c6efd1e482a88c890d3f1cc.tar.gz
freebsd-ports-gnome-d656889d50b308a41c6efd1e482a88c890d3f1cc.tar.zst
freebsd-ports-gnome-d656889d50b308a41c6efd1e482a88c890d3f1cc.zip
. The changes to make in -CURRENT to use MAKEFLAGS make us unable to
override the MAKEFLAGS ARCH value in the main HotSpot Makefile. Fix this by passing in a blank MAKEFLAGS up front so there is nothing to (try to) override. Submitted by: truckman Requested by: kris
-rw-r--r--java/jdk14/Makefile3
-rw-r--r--java/jdk15/Makefile3
-rw-r--r--java/jdk16/Makefile3
3 files changed, 6 insertions, 3 deletions
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index f5956056a7a8..5e4fa299fa56 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -94,7 +94,8 @@ MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \
LANG="C" \
JAVA_HOME="" \
CLASSPATH="" \
- LD_LIBRARY_PATH=""
+ LD_LIBRARY_PATH="" \
+ MAKEFLAGS=""
.if defined(MINIMAL)
MAKE_ENV+= NO_PLUGIN="YES" \
NO_JAVAWS="YES"
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index f5956056a7a8..5e4fa299fa56 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -94,7 +94,8 @@ MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \
LANG="C" \
JAVA_HOME="" \
CLASSPATH="" \
- LD_LIBRARY_PATH=""
+ LD_LIBRARY_PATH="" \
+ MAKEFLAGS=""
.if defined(MINIMAL)
MAKE_ENV+= NO_PLUGIN="YES" \
NO_JAVAWS="YES"
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index f5956056a7a8..5e4fa299fa56 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -94,7 +94,8 @@ MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \
LANG="C" \
JAVA_HOME="" \
CLASSPATH="" \
- LD_LIBRARY_PATH=""
+ LD_LIBRARY_PATH="" \
+ MAKEFLAGS=""
.if defined(MINIMAL)
MAKE_ENV+= NO_PLUGIN="YES" \
NO_JAVAWS="YES"