svn commit: r198380 - in projects/clangbsd: gnu/lib/libgcc gnu/lib/libobjc gnu/lib/libstdc++ gnu/lib/libsupc++ gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/groff/src/libs lib/msun sbin/devd shar...

Roman Divacky rdivacky at FreeBSD.org
Fri Oct 23 07:36:13 UTC 2009 

Author: rdivacky
Date: Fri Oct 23 07:36:12 2009
New Revision: 198380
URL: http://svn.freebsd.org/changeset/base/198380

Log:
  Dont set CC=gcc and CXX=g++ unconditionally but substitute
  cc/clang with gcc and c++ with g++ in the CC variable.
  This way

Modified:
  projects/clangbsd/gnu/lib/libgcc/Makefile
  projects/clangbsd/gnu/lib/libobjc/Makefile
  projects/clangbsd/gnu/lib/libstdc++/Makefile
  projects/clangbsd/gnu/lib/libsupc++/Makefile
  projects/clangbsd/gnu/usr.bin/gperf/Makefile
  projects/clangbsd/gnu/usr.bin/groff/Makefile.inc
  projects/clangbsd/gnu/usr.bin/groff/src/libs/Makefile.inc
  projects/clangbsd/lib/msun/Makefile
  projects/clangbsd/sbin/devd/Makefile
  projects/clangbsd/share/mk/sys.mk
  projects/clangbsd/sys/boot/i386/boot2/Makefile
  projects/clangbsd/sys/boot/i386/gptzfsboot/Makefile
  projects/clangbsd/sys/boot/i386/loader/Makefile
  projects/clangbsd/sys/boot/i386/zfsboot/Makefile

Modified: projects/clangbsd/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/clangbsd/gnu/lib/libgcc/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/gnu/lib/libgcc/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -17,7 +17,7 @@ MK_SSP=	no
 
 # XXX: a few C++ related GCC builtins are missing
 # http://llvm.org/bugs/show_bug.cgi?id=5255
-CC=		gcc
+CC:=${CC:C/cc|clang/gcc/}
 
 .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}/config ${GCCDIR}
 

Modified: projects/clangbsd/gnu/lib/libobjc/Makefile
==============================================================================
--- projects/clangbsd/gnu/lib/libobjc/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/gnu/lib/libobjc/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -13,7 +13,7 @@ SRCS=	archive.c class.c encoding.c gc.c 
 	nil_method.c NXConstStr.m Object.m objects.c Protocol.m sarray.c \
 	selector.c sendmsg.c thr.c thr-objc.c exception.c
 
-CC=gcc
+CC:=${CC:C/cc|clang/gcc/}
 
 INCS=	encoding.h hash.h objc-api.h objc-decls.h objc-list.h objc.h runtime.h \
 	sarray.h thr.h typedstream.h NXConstStr.h Object.h Protocol.h

Modified: projects/clangbsd/gnu/lib/libstdc++/Makefile
==============================================================================
--- projects/clangbsd/gnu/lib/libstdc++/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/gnu/lib/libstdc++/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -21,8 +21,8 @@ CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR}
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
 		-Wno-deprecated
-CC=gcc
-CXX=g++
+CC:=${CC:C/cc|clang/gcc/}
+CXX:=${CXX:C/c\+\+|clang/g++/}
 
 DPADD=		${LIBM}
 LDADD=		-lm

Modified: projects/clangbsd/gnu/lib/libsupc++/Makefile
==============================================================================
--- projects/clangbsd/gnu/lib/libsupc++/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/gnu/lib/libsupc++/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -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=g++
+CXX:=${CXX:C/c\+\+|clang/g++/}
 
 # from libiberty:
 SRCS+=	cp-demangle.c

Modified: projects/clangbsd/gnu/usr.bin/gperf/Makefile
==============================================================================
--- projects/clangbsd/gnu/usr.bin/gperf/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/gnu/usr.bin/gperf/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -12,7 +12,7 @@ SRCS=	bool-array.cc gen-perf.cc hash-tab
 	vectors.cc version.cc
 SRCS+=  hash.cc
 
-CXX=g++
+CXX:=${CXX:C/c\+\+|clang/g++/}
 
 CXXFLAGS+=	-I${GPROFDIR}/lib -I${.CURDIR}
 

Modified: projects/clangbsd/gnu/usr.bin/groff/Makefile.inc
==============================================================================
--- projects/clangbsd/gnu/usr.bin/groff/Makefile.inc	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/gnu/usr.bin/groff/Makefile.inc	Fri Oct 23 07:36:12 2009	(r198380)
@@ -3,7 +3,7 @@
 BINDIR?=	/usr/bin
 SHELL=		/bin/sh
 
-CXX=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	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/gnu/usr.bin/groff/src/libs/Makefile.inc	Fri Oct 23 07:36:12 2009	(r198380)
@@ -3,6 +3,6 @@
 TOPREL=		../../..
 DIST_SUBDIR=	src/libs/${.CURDIR:T}
 
-CXX=g++
+CXX:=${CXX:C/c\+\+|clang/g++/}
 
 .include "../../Makefile.inc"

Modified: projects/clangbsd/lib/msun/Makefile
==============================================================================
--- projects/clangbsd/lib/msun/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/lib/msun/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -15,9 +15,7 @@
 .include <bsd.own.mk>
 
 # XXX: LLVM PR879 in e_rem_pio2.c
-.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" && ${MACHINE_ARCH} == "i386"
-CC=	gcc
-.endif
+CC:=${CC:C/cc|clang/gcc/}
 
 .if ${MACHINE_ARCH} == "i386"
 ARCH_SUBDIR= i387

Modified: projects/clangbsd/sbin/devd/Makefile
==============================================================================
--- projects/clangbsd/sbin/devd/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/sbin/devd/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -4,7 +4,7 @@ PROG_CXX=devd
 SRCS=	devd.cc token.l parse.y y.tab.h
 MAN=	devd.8 devd.conf.5
 
-CXX=g++
+CXX:=${CXX:C/c\+\+|clang/g++/}
 
 WARNS=	0
 #WARNS?=	4

Modified: projects/clangbsd/share/mk/sys.mk
==============================================================================
--- projects/clangbsd/share/mk/sys.mk	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/share/mk/sys.mk	Fri Oct 23 07:36:12 2009	(r198380)
@@ -34,7 +34,7 @@ AFLAGS		?=
 CC		?=	c89
 CFLAGS		?=	-O
 .else
-CC		?=	clang
+CC		?=	cc
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips"
 CFLAGS		?=	-O -pipe
 .else

Modified: projects/clangbsd/sys/boot/i386/boot2/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/boot2/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/sys/boot/i386/boot2/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-CC=		gcc
+CC:=${CC:C/cc|clang/gcc/}
 
 FILES=		boot boot1 boot2
 

Modified: projects/clangbsd/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/gptzfsboot/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/sys/boot/i386/gptzfsboot/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc"
-CC=		gcc
-.endif
+CC:=${CC:C/cc|clang/gcc/}
 
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../gptboot ${.CURDIR}/../zfsboot
 

Modified: projects/clangbsd/sys/boot/i386/loader/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/loader/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/sys/boot/i386/loader/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -4,7 +4,7 @@
 MK_SSP=		no
 
 # XXX: broken compiler include paths
-CC=		gcc
+CC:=${CC:C/cc|clang/gcc/}
 
 PROG=		loader.sym
 INTERNALPROG=

Modified: projects/clangbsd/sys/boot/i386/zfsboot/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/zfsboot/Makefile	Fri Oct 23 07:34:03 2009	(r198379)
+++ projects/clangbsd/sys/boot/i386/zfsboot/Makefile	Fri Oct 23 07:36:12 2009	(r198380)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc"
-CC=		gcc
-.endif
+CC:=${CC:C/cc|clang/gcc/}
 
 .PATH:		${.CURDIR}/../boot2

More information about the svn-src-projects mailing list