aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerald <gerald@FreeBSD.org>2010-09-28 10:48:29 +0800
committergerald <gerald@FreeBSD.org>2010-09-28 10:48:29 +0800
commitdbce8c1beb1cc3b79602930bad9f9d504cdfc43c (patch)
treecc6e4472957cdca6161726ee1ce3e216b8828f06
parentea8817ddc7dcd9be8341684636e02a0ddf73bedb (diff)
downloadfreebsd-ports-gnome-dbce8c1beb1cc3b79602930bad9f9d504cdfc43c.tar.gz
freebsd-ports-gnome-dbce8c1beb1cc3b79602930bad9f9d504cdfc43c.tar.zst
freebsd-ports-gnome-dbce8c1beb1cc3b79602930bad9f9d504cdfc43c.zip
In addition to CC and CXX now also set CPP with USE_GCC. Add the output
of CPP to the test-gcc target. Submitted by: bf
-rw-r--r--Mk/bsd.gcc.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
index 92093864f94b..0d2d45b977e5 100644
--- a/Mk/bsd.gcc.mk
+++ b/Mk/bsd.gcc.mk
@@ -182,7 +182,7 @@ _USE_GCC:=${_GCC_FOUND}
.if defined(_USE_GCC)
# A concrete version has been selected. Determine if the installed OS
# features this version in the base, and if not then set proper ports
-# dependencies, CC, CXX, and flags.
+# dependencies, CC, CXX, CPP, and flags.
.for v in ${GCCVERSIONS}
. if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
. if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R}
@@ -191,6 +191,7 @@ _GCC_BUILD_DEPENDS:= gcc${V}
_GCC_PORT_DEPENDS:= gcc${V}
CC:= gcc${V}
CXX:= g++${V}
+CPP:= cpp${V}
. if ${_USE_GCC} != 3.4
CFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}
LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}
@@ -228,7 +229,7 @@ test-gcc:
.endfor
@echo Using GCC version ${_USE_GCC}
.endif
- @echo CC=${CC} - CXX=${CXX} - CFLAGS=\"${CFLAGS}\"
+ @echo CC=${CC} - CXX=${CXX} - CPP=${CPP} - CFLAGS=\"${CFLAGS}\"
@echo F77=${F77} - FC=${FC} - FFLAGS=\"${FFLAGS}\"
@echo LDFLAGS=\"${LDFLAGS}\"
@echo "BUILD_DEPENDS=${BUILD_DEPENDS}"