diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2010-09-21 21:41:45 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2010-09-21 21:41:45 +0000 |
| commit | d20525351505edbd0bb87faaa101dd42f512ed90 (patch) | |
| tree | e2e944fa953c22961e1dbb57fdc7b716b3c031f3 /gnu | |
| parent | bed6f1849357adb2dafe592e2ec97dd683819d19 (diff) | |
| download | src-d20525351505edbd0bb87faaa101dd42f512ed90.tar.gz src-d20525351505edbd0bb87faaa101dd42f512ed90.zip | |
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)
Notes
Notes:
svn path=/head/; revision=212979
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/libobjc/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile index 3513103f2d7c..80d0240356e2 100644 --- a/gnu/lib/libobjc/Makefile +++ b/gnu/lib/libobjc/Makefile @@ -16,9 +16,7 @@ SRCS= archive.c class.c encoding.c gc.c hash.c init.c linking.m misc.c \ selector.c sendmsg.c thr.c thr-objc.c exception.c # XXX: clang cannot compile libobjc yet -.if ${CC:T:Mclang} == "clang" -CC=gcc -.endif +CC:=${CC:C/^(.*\/)?clang$/gcc/1} 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 |