From owner-svn-src-projects@FreeBSD.ORG Fri Oct 23 12:19:27 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id EFE5D106568B;
Fri, 23 Oct 2009 12:19:26 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id DC2868FC15;
Fri, 23 Oct 2009 12:19:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9NCJQ0i060294;
Fri, 23 Oct 2009 12:19:26 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9NCJQLG060280;
Fri, 23 Oct 2009 12:19:26 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200910231219.n9NCJQLG060280@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Fri, 23 Oct 2009 12:19:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r198387 - 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 sys/...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Oct 2009 12:19:27 -0000
Author: rdivacky
Date: Fri Oct 23 12:19:26 2009
New Revision: 198387
URL: http://svn.freebsd.org/changeset/base/198387
Log:
When replacing cc/clang with gcc only replace the ^cc/^clang
to avoid replacing the string in further params.
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/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 12:02:01 2009 (r198386)
+++ projects/clangbsd/gnu/lib/libgcc/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -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:=${CC:C/cc|clang/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 12:02:01 2009 (r198386)
+++ projects/clangbsd/gnu/lib/libobjc/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -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:=${CC:C/cc|clang/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 12:02:01 2009 (r198386)
+++ projects/clangbsd/gnu/lib/libstdc++/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -22,7 +22,7 @@ CFLAGS+= -frandom-seed=RepeatabilityCons
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 Fri Oct 23 12:02:01 2009 (r198386)
+++ projects/clangbsd/gnu/lib/libsupc++/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -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/gperf/Makefile
==============================================================================
--- projects/clangbsd/gnu/usr.bin/gperf/Makefile Fri Oct 23 12:02:01 2009 (r198386)
+++ projects/clangbsd/gnu/usr.bin/gperf/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -12,7 +12,7 @@ SRCS= bool-array.cc gen-perf.cc hash-tab
vectors.cc version.cc
SRCS+= hash.cc
-CXX:=${CXX:C/c\+\+|clang/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 12:02:01 2009 (r198386)
+++ projects/clangbsd/gnu/usr.bin/groff/Makefile.inc Fri Oct 23 12:19:26 2009 (r198387)
@@ -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 Fri Oct 23 12:02:01 2009 (r198386)
+++ projects/clangbsd/gnu/usr.bin/groff/src/libs/Makefile.inc Fri Oct 23 12:19:26 2009 (r198387)
@@ -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"
Modified: projects/clangbsd/lib/msun/Makefile
==============================================================================
--- projects/clangbsd/lib/msun/Makefile Fri Oct 23 12:02:01 2009 (r198386)
+++ projects/clangbsd/lib/msun/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -15,7 +15,7 @@
.include <bsd.own.mk>
# XXX: LLVM PR879 in e_rem_pio2.c
-CC:=${CC:C/cc|clang/gcc/}
+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 12:02:01 2009 (r198386)
+++ projects/clangbsd/sbin/devd/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -4,7 +4,7 @@ PROG_CXX=devd
SRCS= devd.cc token.l parse.y y.tab.h
MAN= devd.8 devd.conf.5
-CXX:=${CXX:C/c\+\+|clang/g++/}
+CXX:=${CXX:C/^c\+\+|^clang/g++/}
WARNS= 0
#WARNS?= 4
Modified: projects/clangbsd/sys/boot/i386/boot2/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/boot2/Makefile Fri Oct 23 12:02:01 2009 (r198386)
+++ projects/clangbsd/sys/boot/i386/boot2/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -2,7 +2,7 @@
.include <bsd.own.mk>
-CC:=${CC:C/cc|clang/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 12:02:01 2009 (r198386)
+++ projects/clangbsd/sys/boot/i386/gptzfsboot/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -2,7 +2,7 @@
.include <bsd.own.mk>
-CC:=${CC:C/cc|clang/gcc/}
+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 12:02:01 2009 (r198386)
+++ projects/clangbsd/sys/boot/i386/loader/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -4,7 +4,7 @@
MK_SSP= no
# XXX: broken compiler include paths
-CC:=${CC:C/cc|clang/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 12:02:01 2009 (r198386)
+++ projects/clangbsd/sys/boot/i386/zfsboot/Makefile Fri Oct 23 12:19:26 2009 (r198387)
@@ -2,7 +2,7 @@
.include <bsd.own.mk>
-CC:=${CC:C/cc|clang/gcc/}
+CC:=${CC:C/^cc|^clang/gcc/}
.PATH: ${.CURDIR}/../boot2