777d26ce52
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
38 lines
1.1 KiB
Makefile
38 lines
1.1 KiB
Makefile
# $FreeBSD$
|
|
|
|
COMPILERRTDIR= ${SRCTOP}/contrib/compiler-rt
|
|
UNWINDINCDIR= ${SRCTOP}/contrib/libunwind/include
|
|
UNWINDSRCDIR= ${SRCTOP}/contrib/libunwind/src
|
|
|
|
STATIC_CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBILITY_HIDDEN
|
|
|
|
.PATH: ${COMPILERRTDIR}/lib/builtins
|
|
.PATH: ${UNWINDSRCDIR}
|
|
SRCS_EXC+= gcc_personality_v0.c
|
|
SRCS_EXC+= int_util.c
|
|
SRCS_EXC+= Unwind-EHABI.cpp
|
|
SRCS_EXC+= Unwind-sjlj.c
|
|
SRCS_EXC+= UnwindLevel1-gcc-ext.c
|
|
SRCS_EXC+= UnwindLevel1.c
|
|
SRCS_EXC+= UnwindRegistersRestore.S
|
|
SRCS_EXC+= UnwindRegistersSave.S
|
|
SRCS_EXC+= libunwind.cpp
|
|
|
|
SRCS+= ${SRCS_EXC}
|
|
.for file in ${SRCS_EXC:M*.c}
|
|
CFLAGS.${file}+= -fno-exceptions -funwind-tables
|
|
.endfor
|
|
.for file in ${SRCS_EXC:M*.cpp}
|
|
CXXFLAGS.${file}+= -fno-exceptions -funwind-tables
|
|
.endfor
|
|
|
|
CFLAGS+= -I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY
|
|
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"
|
|
# Avoid dependency on lib/libc++
|
|
CFLAGS+= -isystem ${SRCTOP}/contrib/libc++/include -nostdinc++
|
|
.endif
|