Module Name: src
Committed By: joerg
Date: Fri May 20 13:21:19 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Really apply the -no-integrated-as only for clang.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amd64/conf/Makefile.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.32 src/sys/arch/amd64/conf/Makefile.amd64:1.33
--- src/sys/arch/amd64/conf/Makefile.amd64:1.32 Fri May 20 13:19:59 2011
+++ src/sys/arch/amd64/conf/Makefile.amd64 Fri May 20 13:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.32 2011/05/20 13:19:59 joerg Exp $
+# $NetBSD: Makefile.amd64,v 1.33 2011/05/20 13:21:19 joerg Exp $
# Makefile for NetBSD
#
@@ -63,10 +63,10 @@
spl.o: ${AMD64}/amd64/spl.S assym.h
${NORMAL_S}
-AFLAGS.locore.S= -no-integrated-as
-AFLAGS.mptramp.S= -no-integrated-as
-AFLAGS.linux32_sigcode.S= -no-integrated-as
-AFLAGS.netbsd32_sigcode.S= -no-integrated-as
+AFLAGS.locore.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} -I${.CURDIR}
+AFLAGS.mptramp.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} -I${.CURDIR}
+AFLAGS.linux32_sigcode.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} -I${.CURDIR}
+AFLAGS.netbsd32_sigcode.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} -I${.CURDIR}
##
## (5) link settings
