path: root/lib/libgcc_eh
diff options
authorEnji Cooper <ngie@FreeBSD.org>2019-03-29 18:45:27 +0000
committerEnji Cooper <ngie@FreeBSD.org>2019-03-29 18:45:27 +0000
commite8067928ff5f819ef78ad4acfb12124415ea2fff (patch)
tree6877785f0579f6ffbad0ceacb9815755d0d152a4 /lib/libgcc_eh
parentbdbf3440cef44fdda6b975e29805df1c88b1c9f6 (diff)
Standardize `-std=c++* as `CXXSTD`
CXXSTD was added as the C++ analogue to CSTD. CXXSTD defaults to `-std=c++11` with supporting compilers; `-std=gnu++98`, otherwise for older versions of g++. This change standardizes the CXXSTD variable, originally added to googletest.test.inc.mk as part of r345203. As part of this effort, convert all `CXXFLAGS+= -std=*` calls to use `CXXSTD`. Notes: This value is not sanity checked in bsd.sys.mk, however, given the two most used C++ compilers on FreeBSD (clang++ and g++) support both modes, it is likely to work with both toolchains. This method will be refined in the future to support more variants of C++, as not all versions of clang++ and g++ (for instance) support C++14, C++17, etc. Any manual appending of `-std=*` to `CXXFLAGS` should be replaced with CXXSTD. Example: Before this commit: ``` CXXFLAGS+= -std=c++14 ``` After this commit: ``` CXXSTD= c++14 ``` Reviewed by: asomers Approved by: emaste (mentor) MFC after: 1 month MFC with: r345203, r345704, r345705 Relnotes: yes Tested with: make tinderbox Differential Revision: https://reviews.freebsd.org/D19732
Notes: svn path=/head/; revision=345708
Diffstat (limited to 'lib/libgcc_eh')
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc
index 5c8af2141382..39cccec7e6d9 100644
--- a/lib/libgcc_eh/Makefile.inc
+++ b/lib/libgcc_eh/Makefile.inc
@@ -27,10 +27,8 @@ CXXFLAGS.${file}+= -fno-exceptions -funwind-tables
-.if empty(CXXFLAGS:M-std=*)
-CXXFLAGS+= -std=c++11
CXXFLAGS+= -fno-rtti
+CXXSTD= c++11
STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
# Probably need to just move this earlier or use CXXFLAGS
.if ${MK_DIRDEPS_BUILD} == "yes"