summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2013-12-30 20:15:46 +0000
committerdim <dim@FreeBSD.org>2013-12-30 20:15:46 +0000
commit5fce04bd49f3f5cc0cdad8752ecca4dd5682a21b (patch)
tree0dad04d1ac565d14d7c55b2a8173f9128cc6509e /usr.bin
parent8a773bc13424e791cea0f4c0136a48f9667e87c5 (diff)
downloadFreeBSD-src-5fce04bd49f3f5cc0cdad8752ecca4dd5682a21b.zip
FreeBSD-src-5fce04bd49f3f5cc0cdad8752ecca4dd5682a21b.tar.gz
MFC r257532 (by adrian):
Fix this build for clang. MFC r259730: To avoid having to explicitly test COMPILER_TYPE for setting clang-specific or gcc-specific flags, introduce the following new variables for use in Makefiles: CFLAGS.clang CFLAGS.gcc CXXFLAGS.clang CXXFLAGS.gcc In bsd.sys.mk, these get appended to the regular CFLAGS or CXXFLAGS for the right compiler. MFC r259913: For libstand and sys/boot, split off gcc-only flags into CFLAGS.gcc. MFC r259927: Fix pc98 build, by also forcing COMPILER_TYPE in sys/boot/pc98/boot2's Makefile. Pointy hat to: dim
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/mkcsmapper/Makefile.inc4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/mkcsmapper/Makefile.inc b/usr.bin/mkcsmapper/Makefile.inc
index e0acc9b..5a4cc6f 100644
--- a/usr.bin/mkcsmapper/Makefile.inc
+++ b/usr.bin/mkcsmapper/Makefile.inc
@@ -6,6 +6,4 @@ SRCS+= lex.l yacc.y
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mkcsmapper \
-I${.CURDIR}/../../lib/libc/iconv \
-I${.CURDIR}/../../lib/libiconv_modules/mapper_std
-.if ${COMPILER_TYPE} == "gcc"
-CFLAGS+= --param max-inline-insns-single=64
-.endif
+CFLAGS.gcc+= --param max-inline-insns-single=64
OpenPOWER on IntegriCloud