diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2007-06-06 15:54:28 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2007-06-06 15:54:28 +0000 |
| commit | 569945787df0a76b6615e1ef4917be00576ecd72 (patch) | |
| tree | 01b071f0e6d16904d6b3a03c44b7862c63b59ac8 /java | |
| parent | 8a88cb13c1475d9c2f3fca83daf23757efa92b04 (diff) | |
| download | ports-569945787df0a76b6615e1ef4917be00576ecd72.tar.gz ports-569945787df0a76b6615e1ef4917be00576ecd72.zip | |
Notes
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk14/files/patch-common::Defs-bsd.gmk | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/java/jdk14/files/patch-common::Defs-bsd.gmk b/java/jdk14/files/patch-common::Defs-bsd.gmk index fc86ed9b68a5..62700f5e915d 100644 --- a/java/jdk14/files/patch-common::Defs-bsd.gmk +++ b/java/jdk14/files/patch-common::Defs-bsd.gmk @@ -1,7 +1,26 @@ $FreeBSD$ - ---- ../../j2se/make/common/Defs-bsd.gmk.orig Fri Dec 8 11:50:23 2006 -+++ ../../j2se/make/common/Defs-bsd.gmk Fri Dec 8 11:58:29 2006 +--- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Jun 3 10:46:29 2007 ++++ ../../j2se/make/common/Defs-bsd.gmk Sun Jun 3 11:04:08 2007 +@@ -40,15 +40,15 @@ + BASENAME = $(USRBIN_PATH)basename + CAT = $(UNIXCOMMAND_PATH)cat + ifneq ($(TRUE_PLATFORM), OpenBSD) +-CC = $(COMPILER_PATH)gcc +-CPP = $(COMPILER_PATH)gcc -E ++CC ?= $(COMPILER_PATH)gcc ++CPP ?= $(COMPILER_PATH)gcc -E + ifeq ($(STATIC_CXX),true) + # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++" + # We need to use gcc to statically link the C++ runtime. gcc and g++ use + # the same subprocess to compile C++ files, so it is OK to build using gcc. +-CXX = $(COMPILER_PATH)gcc ++CXX ?= $(COMPILER_PATH)gcc + else +-CXX = $(COMPILER_PATH)g++ ++CXX ?= $(COMPILER_PATH)g++ + endif + else + # Allow ports/pkgsrc infrastructure to override CC, CPP and CXX. @@ -192,7 +192,7 @@ ifeq ($(TRUE_PLATFORM), NetBSD) DEVTOOLS_PATH = /usr/pkg/bin/ |