summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-02-21 22:38:25 +0000
committerdim <dim@FreeBSD.org>2014-02-21 22:38:25 +0000
commit53318431dc1df74537c69fd99d7f3168769ef596 (patch)
treee8fb3dfb97cb30d7bc0247b8b1b40515893872cd /share
parent1c3ca2a367546ecfe8f196c7c9978e80a0f9e566 (diff)
downloadFreeBSD-src-53318431dc1df74537c69fd99d7f3168769ef596.zip
FreeBSD-src-53318431dc1df74537c69fd99d7f3168769ef596.tar.gz
Move the part in bsd.own.mk that sets -Wno-c++11-extensions for clang to
bsd.sys.mk, where it really belongs. This also causes the flag to get added when clang is *not* the default system compiler, but is still used, e.g. by setting WITH_CLANG_IS_CC manually. MFC after: 3 days
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.own.mk9
-rw-r--r--share/mk/bsd.sys.mk6
2 files changed, 6 insertions, 9 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 03f6c0b..2a79c42 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -420,15 +420,6 @@ __DEFAULT_YES_OPTIONS+=GCC
.else
__DEFAULT_NO_OPTIONS+=GCC GNUCXX
.endif
-# The libc++ headers use c++11 extensions. These are normally silenced because
-# they are treated as system headers, but we explicitly disable that warning
-# suppression when building the base system to catch bugs in our headers.
-# Eventually we'll want to start building the base system C++ code as C++11,
-# but not yet.
-_COMPVERSION!= ${CC} --version
-.if ${_COMPVERSION:Mclang}
-CXXFLAGS+= -Wno-c++11-extensions
-.endif
.else
# If clang is not cc, then build gcc by default
__DEFAULT_NO_OPTIONS+=CLANG_IS_CC
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 5ba2d51..7779580 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -120,6 +120,12 @@ CLANG_NO_IAS= -no-integrated-as
CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
-mllvm -enable-load-pre=false -mllvm -simplifycfg-dup-ret
CFLAGS+= -Qunused-arguments
+# The libc++ headers use c++11 extensions. These are normally silenced because
+# they are treated as system headers, but we explicitly disable that warning
+# suppression when building the base system to catch bugs in our headers.
+# Eventually we'll want to start building the base system C++ code as C++11,
+# but not yet.
+CXXFLAGS+= -Wno-c++11-extensions
CFLAGS+= ${CFLAGS.clang}
CXXFLAGS+= ${CXXFLAGS.clang}
.else # !CLANG
OpenPOWER on IntegriCloud