Merge pull request #14 from sg2342/clang

Clang support

AUTHORS

@@ -3,3 +3,4 @@ The following people have contributed to this repository:
 Justin Cormack <[email protected]>
 Antti Kantee <[email protected]>
 Stephan Renatus <[email protected]>
+Stefan Grundmann <[email protected]>

Makefile

@@ -164,11 +164,11 @@ $(foreach util,${NBUTILS},$(eval $(call NBUTIL_templ,${util},$(notdir ${util})))
 
 INSTALL_PATH=${PWD}
 
-${NBCC}:	cc.in rump/lib/rump-cc.specs rump/lib/ld
+${NBCC}:	cc.in rump/lib/rump-cc.specs rump/lib/ld.rump
 		sed "s|@PATH@|${INSTALL_PATH}|g" $< > $@
 		chmod +x $@
 
-rump/lib/ld:	ld.in
+rump/lib/ld.rump:	ld.in
 		sed "s|@PATH@|${PWD}|g" $< > $@
 		chmod +x $@
 

buildnb.sh

@@ -79,10 +79,6 @@ done
 [ ! -f ./buildrump.sh/subr.sh ] && git submodule update --init buildrump.sh
 . ./buildrump.sh/subr.sh
 
-if ! ${CC:-cc} --version | grep -q 'Free Software Foundation'; then
-	die 'rumprun-posix currently requires CC=gcc'
-fi
-
 ${MAKE} --version | grep -q 'GNU Make' \
     || die GNU Make required, '$MAKE' "(${MAKE})" is not
 

cc.in

@@ -3,4 +3,11 @@ set -e
 case " $* " in
 *" -v "*)   set -x ;;
 esac
-exec "${REALCC:-cc}" "$@" -specs "@PATH@/rump/lib/rump-cc.specs"
+if ! ${REALCC:-cc} --version | grep -q 'Free Software Foundation'; then
+	export PATH=@PATH@/rump/lib:$PATH
+	exec "${REALCC:-cc}" -nostdinc -D__NetBSD__ -U__FreeBSD__ -Ulinux \
+		-U__linux -U__linux__ -U__gnu_linux__ -isystem @PATH@/rump/include \
+		-fuse-ld=rump -nostdlib "$@"
+else
+	exec "${REALCC:-cc}" "$@" -specs "@PATH@/rump/lib/rump-cc.specs"
+fi

specs.in

@@ -7,7 +7,7 @@
 %(cc1_cpu) -nostdinc -isystem @PATH@/rump/include -isystem include%s
 
 *linker:
-@PATH@/rump/lib/ld --stunt-intermediate %g.link1 %g.link2
+@PATH@/rump/lib/ld.rump --stunt-intermediate %g.link1 %g.link2
 
 *link:
 -nostdlib %s