[Midnightbsd-cvs] src [8395] trunk: clang bandaid

[laffer1 at midnightbsd.org]

Revision: 8395
          http://svnweb.midnightbsd.org/src/?rev=8395
Author:   laffer1
Date:     2016-09-18 15:25:04 -0400 (Sun, 18 Sep 2016)
Log Message:
-----------
clang bandaid

Modified Paths:
--------------
    trunk/Makefile
    trunk/Makefile.inc1

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2016-09-18 19:23:58 UTC (rev 8394)
+++ trunk/Makefile	2016-09-18 19:25:04 UTC (rev 8395)
@@ -102,6 +102,10 @@
 
 TGTS+=	${SUBDIR_TARGETS}
 
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.cdboot.S=	${CLANG_NO_IAS}
+CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
+
 BITGTS=	files includes
 BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
 TGTS+=	${BITGTS}

Modified: trunk/Makefile.inc1
===================================================================
--- trunk/Makefile.inc1	2016-09-18 19:23:58 UTC (rev 8394)
+++ trunk/Makefile.inc1	2016-09-18 19:25:04 UTC (rev 8395)
@@ -1110,7 +1110,7 @@
 _share=	share/syscons/scrnmaps
 .endif
 
-.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no"
+.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
 _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif
 
@@ -1186,7 +1186,7 @@
 _clang_libs=	lib/clang
 .endif
 
-.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no"
+.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
 _cc=		gnu/usr.bin/cc
 .endif