From owner-svn-src-head@FreeBSD.ORG  Tue Aug 31 17:33:29 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EF6B710656AD;
	Tue, 31 Aug 2010 17:33:29 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE8E38FC14;
	Tue, 31 Aug 2010 17:33:29 +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 o7VHXT2E036973;
	Tue, 31 Aug 2010 17:33:29 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7VHXTsf036970;
	Tue, 31 Aug 2010 17:33:29 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201008311733.o7VHXTsf036970@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 31 Aug 2010 17:33:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212060 - in head: gnu/lib/libobjc sys/boot/i386/boot2
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Aug 2010 17:33:30 -0000

Author: dim
Date: Tue Aug 31 17:33:29 2010
New Revision: 212060
URL: http://svn.freebsd.org/changeset/base/212060

Log:
  Use a more robust way to substitute gcc for clang, when compiling
  gnu/lib/libobjc and sys/boot/i386/boot2, so it also works when using
  absolute paths and/or options, as in CC="/absolute/path/clang -foo".
  
  Approved by:	rpaulo (mentor)

Modified:
  head/gnu/lib/libobjc/Makefile
  head/sys/boot/i386/boot2/Makefile

Modified: head/gnu/lib/libobjc/Makefile
==============================================================================
--- head/gnu/lib/libobjc/Makefile	Tue Aug 31 17:22:57 2010	(r212059)
+++ head/gnu/lib/libobjc/Makefile	Tue Aug 31 17:33:29 2010	(r212060)
@@ -16,7 +16,9 @@ SRCS=	archive.c class.c encoding.c gc.c 
 	selector.c sendmsg.c thr.c thr-objc.c exception.c
 
 # XXX: clang cannot compile libobjc yet
-CC:=${CC:C/^cc|^clang/gcc/}
+.if ${CC:T:Mclang} == "clang"
+CC=gcc
+.endif
 
 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: head/sys/boot/i386/boot2/Makefile
==============================================================================
--- head/sys/boot/i386/boot2/Makefile	Tue Aug 31 17:22:57 2010	(r212059)
+++ head/sys/boot/i386/boot2/Makefile	Tue Aug 31 17:33:29 2010	(r212060)
@@ -3,7 +3,9 @@
 .include <bsd.own.mk>
 
 # XXX: clang can compile the boot code just fine, but boot2 gets too big
-CC:=${CC:C/^cc|^clang/gcc/}
+.if ${CC:T:Mclang} == "clang"
+CC=gcc
+.endif
 
 FILES=		boot boot1 boot2