Date: Tue, 31 Aug 2010 17:33:29 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r212060 - in head: gnu/lib/libobjc sys/boot/i386/boot2 Message-ID: <201008311733.o7VHXTsf036970@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008311733.o7VHXTsf036970>