diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2004-08-10 20:28:44 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2004-08-10 20:28:44 +0000 |
| commit | 453f0beec3bfe5cf1463624f8b2dc0284a2d2192 (patch) | |
| tree | f135cda7851ed7336a4537d991b92f4715a8e82f /java/jdk13 | |
| parent | . Call unregistervm with the VM we registered, not the comment associated (diff) | |
. Set CC, CXX and CPP conditionally so that this port will respect them
if set in the port build. Note that the HotSpot build will likely
require additional changes for it to also respect these variables.
Notes
Notes:
svn path=/head/; revision=115870
Diffstat (limited to 'java/jdk13')
| -rw-r--r-- | java/jdk13/files/patch-common::Defs-bsd.gmk | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/java/jdk13/files/patch-common::Defs-bsd.gmk b/java/jdk13/files/patch-common::Defs-bsd.gmk index 9ce2386aec4c..67e497d01c5f 100644 --- a/java/jdk13/files/patch-common::Defs-bsd.gmk +++ b/java/jdk13/files/patch-common::Defs-bsd.gmk @@ -2,7 +2,21 @@ $FreeBSD$ --- common/Defs-bsd.gmk.orig Thu Dec 18 22:33:22 2003 +++ common/Defs-bsd.gmk Thu Dec 18 22:36:46 2003 -@@ -131,7 +131,7 @@ +@@ -32,9 +32,10 @@ + AR = $(USRBIN_PATH)ar + AS = $(USRBIN_PATH)as + CAT = $(UNIXCOMMAND_PATH)cat +-CC = $(COMPILER_PATH)gcc +-CPP = $(COMPILER_PATH)gcc -E +-CXX = $(COMPILER_PATH)g++ ++# Allow ports/pkgsrc infrastructure to override CC, CPP and CXX. ++CC ?= $(COMPILER_PATH)gcc ++CPP ?= $(COMPILER_PATH)gcc -E ++CXX ?= $(COMPILER_PATH)g++ + CD = cd # intrinsic unix command + CHMOD = $(UNIXCOMMAND_PATH)chmod + CMP = $(USRBIN_PATH)cmp +@@ -131,7 +132,7 @@ ifeq ($(TRUE_PLATFORM), NetBSD) DEVTOOLS_PATH = /usr/pkg/bin/ else @@ -11,7 +25,7 @@ $FreeBSD$ endif # Allow the user to override the default value... ifdef ALT_DEVTOOLS_PATH -@@ -266,9 +266,9 @@ +@@ -266,9 +267,9 @@ CFLAGS_COMMON += -fsigned-char CXXFLAGS_COMMON+= -fsigned-char endif |