aboutsummaryrefslogtreecommitdiff
path: root/lib/libgcc_eh
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2019-03-29 18:31:48 +0000
committerEnji Cooper <ngie@FreeBSD.org>2019-03-29 18:31:48 +0000
commit760b1a815b5c2fbb0f32796d3bc731aac8c87ace (patch)
tree22e8924bf0eae4d597df29297ed7d3533c32f5a9 /lib/libgcc_eh
parent752cabaa1cf94dff142dfe91161f627df793c2f8 (diff)
downloadsrc-760b1a815b5c2fbb0f32796d3bc731aac8c87ace.tar.gz
src-760b1a815b5c2fbb0f32796d3bc731aac8c87ace.zip
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
Notes: svn path=/head/; revision=345706
Diffstat (limited to 'lib/libgcc_eh')
-rw-r--r--lib/libgcc_eh/Makefile.inc4
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
.endfor
CFLAGS+= -I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY
-.if empty(CXXFLAGS:M-std=*)
-CXXFLAGS+= -std=c++11
-.endif
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"