svn commit: r199516 - in projects/clangbsd/gnu: lib/libstdc++
lib/libsupc++ usr.bin/groff usr.bin/groff/src/libs
Roman Divacky
rdivacky at FreeBSD.org
Thu Nov 19 11:14:17 UTC 2009
Author: rdivacky
Date: Thu Nov 19 11:14:16 2009
New Revision: 199516
URL: http://svn.freebsd.org/changeset/base/199516
Log:
when altering CXX, check for clang++ and not clang
Modified:
projects/clangbsd/gnu/lib/libstdc++/Makefile
projects/clangbsd/gnu/lib/libsupc++/Makefile
projects/clangbsd/gnu/usr.bin/groff/Makefile.inc
projects/clangbsd/gnu/usr.bin/groff/src/libs/Makefile.inc
Modified: projects/clangbsd/gnu/lib/libstdc++/Makefile
==============================================================================
--- projects/clangbsd/gnu/lib/libstdc++/Makefile Thu Nov 19 11:13:36 2009 (r199515)
+++ projects/clangbsd/gnu/lib/libstdc++/Makefile Thu Nov 19 11:14:16 2009 (r199516)
@@ -21,8 +21,7 @@ CFLAGS+= -I${GCCLIB}/include -I${SRCDIR}
CFLAGS+= -frandom-seed=RepeatabilityConsideredGood
CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \
-Wno-deprecated
-CC:=${CC:C/^cc|^clang/gcc/}
-CXX:=${CXX:C/^c\+\+|^clang/g++/}
+CXX:=${CXX:C/^c\+\+|^clang\+\+/g++/}
DPADD= ${LIBM}
LDADD= -lm
Modified: projects/clangbsd/gnu/lib/libsupc++/Makefile
==============================================================================
--- projects/clangbsd/gnu/lib/libsupc++/Makefile Thu Nov 19 11:13:36 2009 (r199515)
+++ projects/clangbsd/gnu/lib/libsupc++/Makefile Thu Nov 19 11:14:16 2009 (r199516)
@@ -15,7 +15,7 @@ SRCS+= del_op.cc del_opnt.cc del_opv.cc
new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \
vec.cc vterminate.cc
-CXX:=${CXX:C/^c\+\+|^clang/g++/}
+CXX:=${CXX:C/^c\+\+|^clang\+\+/g++/}
# from libiberty:
SRCS+= cp-demangle.c
Modified: projects/clangbsd/gnu/usr.bin/groff/Makefile.inc
==============================================================================
--- projects/clangbsd/gnu/usr.bin/groff/Makefile.inc Thu Nov 19 11:13:36 2009 (r199515)
+++ projects/clangbsd/gnu/usr.bin/groff/Makefile.inc Thu Nov 19 11:14:16 2009 (r199516)
@@ -3,7 +3,7 @@
BINDIR?= /usr/bin
SHELL= /bin/sh
-CXX:=${CXX:C/^c\+\+|^clang/g++/}
+CXX:=${CXX:C/^c\+\+|^clang\+\+/g++/}
# Define `page' to be letter if your PostScript printer uses 8.5x11
# paper (USA) and define it to be A4, if it uses A4 paper (rest of the
Modified: projects/clangbsd/gnu/usr.bin/groff/src/libs/Makefile.inc
==============================================================================
--- projects/clangbsd/gnu/usr.bin/groff/src/libs/Makefile.inc Thu Nov 19 11:13:36 2009 (r199515)
+++ projects/clangbsd/gnu/usr.bin/groff/src/libs/Makefile.inc Thu Nov 19 11:14:16 2009 (r199516)
@@ -3,6 +3,6 @@
TOPREL= ../../..
DIST_SUBDIR= src/libs/${.CURDIR:T}
-CXX:=${CXX:C/^c\+\+|^clang/g++/}
+CXX:=${CXX:C/^c\+\+|^clang\+\+/g++/}
.include "../../Makefile.inc"
More information about the svn-src-projects
mailing list