From owner-svn-src-projects@FreeBSD.ORG Thu Nov 19 11:14:17 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 4D7981065670;
Thu, 19 Nov 2009 11:14:17 +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 219808FC19;
Thu, 19 Nov 2009 11:14:17 +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 nAJBEHYq004689;
Thu, 19 Nov 2009 11:14:17 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAJBEGuN004684;
Thu, 19 Nov 2009 11:14:16 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911191114.nAJBEGuN004684@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Thu, 19 Nov 2009 11:14:16 +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: r199516 - in projects/clangbsd/gnu: lib/libstdc++
lib/libsupc++ usr.bin/groff usr.bin/groff/src/libs
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: Thu, 19 Nov 2009 11:14:17 -0000
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"