diff options
author | dim <dim@FreeBSD.org> | 2014-02-24 21:22:44 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2014-02-24 21:22:44 +0000 |
commit | 6cf335a1b4c91801524f352fee8ea079b7c4c099 (patch) | |
tree | bd8ee68ff608e7e73b577aeeb9238178bf8ee5c0 /share | |
parent | 3948f93fc83c9323caf1f8d15a2737efcd9f4381 (diff) | |
download | FreeBSD-src-6cf335a1b4c91801524f352fee8ea079b7c4c099.zip FreeBSD-src-6cf335a1b4c91801524f352fee8ea079b7c4c099.tar.gz |
MFC r262310:
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.
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.own.mk | 9 | ||||
-rw-r--r-- | share/mk/bsd.sys.mk | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index ab56beb..740e6d4 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -418,15 +418,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 961aa7d..4651121 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 |