summaryrefslogtreecommitdiffstats
path: root/sys/boot/pc98
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2010-09-21 21:41:45 +0000
committerdim <dim@FreeBSD.org>2010-09-21 21:41:45 +0000
commit0f23475721730c555ad3bcf2a1e2095eed4f0945 (patch)
treee2e944fa953c22961e1dbb57fdc7b716b3c031f3 /sys/boot/pc98
parentd776b5f9560dfcb767fc4762f6a5d31a5254e378 (diff)
downloadFreeBSD-src-0f23475721730c555ad3bcf2a1e2095eed4f0945.zip
FreeBSD-src-0f23475721730c555ad3bcf2a1e2095eed4f0945.tar.gz
When building world with clang, for gnu/lib/libobjc, sys/boot/i386/boot2
and sys/boot/pc98/boot2, do not simply assign 'gcc' to CC, since compile flags are sometimes passed via this variable, for example during the build32 stage on amd64. This caused the 32-bit libobjc build on amd64 to fail. Instead, only replace the first instance of clang (if any, including optional path) with gcc, and leave the arguments alone. Approved-by: rpaulo (mentor)
Diffstat (limited to 'sys/boot/pc98')
-rw-r--r--sys/boot/pc98/boot2/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index 5f7355f..dfd8607 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -3,9 +3,7 @@
.include <bsd.own.mk>
# XXX: clang can compile the boot code just fine, but boot2 gets too big
-.if ${CC:T:Mclang} == "clang"
-CC=gcc
-.endif
+CC:=${CC:C/^(.*\/)?clang$/gcc/1}
FILES= boot boot1 boot2
OpenPOWER on IntegriCloud