453f0beec3
if set in the port build. Note that the HotSpot build will likely require additional changes for it to also respect these variables.
39 lines
1.2 KiB
Text
39 lines
1.2 KiB
Text
$FreeBSD$
|
|
|
|
--- common/Defs-bsd.gmk.orig Thu Dec 18 22:33:22 2003
|
|
+++ common/Defs-bsd.gmk Thu Dec 18 22:36:46 2003
|
|
@@ -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
|
|
-DEVTOOLS_PATH = /usr/local/bin/
|
|
+DEVTOOLS_PATH = $(LOCALBASE)/bin/
|
|
endif
|
|
# Allow the user to override the default value...
|
|
ifdef ALT_DEVTOOLS_PATH
|
|
@@ -266,9 +267,9 @@
|
|
CFLAGS_COMMON += -fsigned-char
|
|
CXXFLAGS_COMMON+= -fsigned-char
|
|
endif
|
|
-CFLAGS_OPT = $(POPT)
|
|
+CFLAGS_OPT = $(POPT) $(SYS_CFLAGS)
|
|
CFLAGS_DBG = -g3 $(POPT)
|
|
-CXXFLAGS_OPT = $(POPT)
|
|
+CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS)
|
|
CXXFLAGS_DBG = -g3 $(POPT)
|
|
|
|
CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \
|