blob: 686183aca93473b77386e02794d15f6b4982eca7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
$FreeBSD$
--- common/Defs-bsd.gmk.orig Fri Dec 8 09:17:41 2006
+++ common/Defs-bsd.gmk Fri Dec 8 10:53:36 2006
@@ -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) \
@@ -372,7 +373,7 @@
override LIBTHREAD =
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = true
-override OPENWINHOME = /usr/X11R6
+override OPENWINHOME = $(X11BASE)
override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
override PREPROCESS_BEFORE_AS = true
override PRIVATIZE_JVM_SYMBOLS = false
@@ -416,7 +417,7 @@
CPPFLAGS_COMMON += -I$(MOTIF_DIR)/include
LDFLAGS_COMMON += -L$(MOTIF_DIR)/lib -L/usr/X11R6/lib # for libXp
else
- MOTIF_DIR=/usr/X11R6
+ MOTIF_DIR=$(X11BASE)
endif
endif
ifdef ALT_MOTIF_DIR
|
