Page MenuHomeFreeBSD
Files F103198466

D19732.diff
No OneTemporary
Actions

D19732.diff
View Options

Index: head/lib/clang/llvm.build.mk
===================================================================
--- head/lib/clang/llvm.build.mk
+++ head/lib/clang/llvm.build.mk
@@ -95,7 +95,7 @@
CFLAGS+= -fdata-sections
LDFLAGS+= -Wl,--gc-sections
-CXXFLAGS+= -std=c++11
+CXXSTD?= c++11
CXXFLAGS+= -fno-exceptions
CXXFLAGS+= -fno-rtti
CXXFLAGS.clang+= -stdlib=libc++
Index: head/lib/libc++/Makefile
===================================================================
--- head/lib/libc++/Makefile
+++ head/lib/libc++/Makefile
@@ -76,9 +76,7 @@
CFLAGS+= -nostdlib
CFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
CFLAGS+= -DLIBCXXRT
-.if empty(CXXFLAGS:M-std=*)
-CXXFLAGS+= -std=c++11
-.endif
+CXXSTD= c++11
LIBADD+= cxxrt
INCSGROUPS= STD EXP EXT
Index: head/lib/libc++experimental/Makefile
===================================================================
--- head/lib/libc++experimental/Makefile
+++ head/lib/libc++experimental/Makefile
@@ -20,8 +20,6 @@
CXXFLAGS+= -nostdlib
CXXFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
CXXFLAGS+= -DLIBCXXRT
-.if empty(CXXFLAGS:M-std=*)
-CXXFLAGS+= -std=c++14
-.endif
+CXXSTD= c++14
.include <bsd.lib.mk>
Index: head/lib/libc++fs/Makefile
===================================================================
--- head/lib/libc++fs/Makefile
+++ head/lib/libc++fs/Makefile
@@ -22,8 +22,6 @@
CXXFLAGS+= -nostdlib
CXXFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
CXXFLAGS+= -DLIBCXXRT
-.if empty(CXXFLAGS:M-std=*)
-CXXFLAGS+= -std=c++14
-.endif
+CXXSTD= c++14
.include <bsd.lib.mk>
Index: head/lib/libc/tests/stdlib/Makefile
===================================================================
--- head/lib/libc/tests/stdlib/Makefile
+++ head/lib/libc/tests/stdlib/Makefile
@@ -50,8 +50,8 @@
CFLAGS+= -I${.CURDIR}
-CXXFLAGS.cxa_thread_atexit_test+= -std=c++11
-CXXFLAGS.cxa_thread_atexit_nothr_test+= -std=c++11
+CXXSTD.cxa_thread_atexit_test= c++11
+CXXSTD.cxa_thread_atexit_nothr_test= c++11
LIBADD.cxa_thread_atexit_test+= pthread
.for t in h_getopt h_getopt_long
Index: head/lib/libclang_rt/Makefile.inc
===================================================================
--- head/lib/libclang_rt/Makefile.inc
+++ head/lib/libclang_rt/Makefile.inc
@@ -41,4 +41,4 @@
CXXFLAGS+= -fvisibility-inlines-hidden
CXXFLAGS+= -fvisibility=hidden
CFLAGS+= -I${CRTSRC}/lib
-CXXFLAGS+= -std=c++11
+CXXSTD= c++11
Index: head/lib/libcxxrt/Makefile
===================================================================
--- head/lib/libcxxrt/Makefile
+++ head/lib/libcxxrt/Makefile
@@ -22,9 +22,7 @@
WARNS= 0
CFLAGS+= -isystem ${SRCDIR} -nostdinc++
-.if empty(CXXFLAGS:M-std=*)
-CXXFLAGS+= -std=c++11
-.endif
+CXXSTD= c++11
VERSION_MAP= ${.CURDIR}/Version.map
.include <bsd.lib.mk>
Index: head/lib/libgcc_eh/Makefile.inc
===================================================================
--- head/lib/libgcc_eh/Makefile.inc
+++ head/lib/libgcc_eh/Makefile.inc
@@ -27,10 +27,8 @@
.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"
Index: head/lib/libomp/Makefile
===================================================================
--- head/lib/libomp/Makefile
+++ head/lib/libomp/Makefile
@@ -53,9 +53,9 @@
CFLAGS+= -ffunction-sections
CFLAGS+= -fdata-sections
CXXFLAGS+= -fvisibility-inlines-hidden
-CXXFLAGS+= -std=c++11
CXXFLAGS+= -fno-exceptions
CXXFLAGS+= -fno-rtti
+CXXSTD= c++11
LDFLAGS+= -Wl,--warn-shared-textrel
LDFLAGS+= -Wl,--gc-sections
Index: head/lib/ofed/libibnetdisc/Makefile
===================================================================
--- head/lib/ofed/libibnetdisc/Makefile
+++ head/lib/ofed/libibnetdisc/Makefile
@@ -31,9 +31,6 @@
CFLAGS+= -DHAVE_CONFIG_H=1
CFLAGS+= -I${_spath}
CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
-.if ${COMPILER_FEATURES:Mc++11}
-CXXFLAGS+= -std=c++11
-.endif
VERSION_MAP= ${_spath}/libibnetdisc.map
.include <bsd.lib.mk>
Index: head/share/mk/bsd.progs.mk
===================================================================
--- head/share/mk/bsd.progs.mk
+++ head/share/mk/bsd.progs.mk
@@ -22,8 +22,8 @@
.if defined(PROG)
# just one of many
-PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \
- PROGNAME SRCS STRIP WARNS
+PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE CSTD CXXSTD DPSRCS MAN \
+ NO_WERROR PROGNAME SRCS STRIP WARNS
PROG_VARS += CFLAGS CXXFLAGS DEBUG_FLAGS DPADD INTERNALPROG LDADD LIBADD \
LINKS LDFLAGS MLINKS ${PROG_OVERRIDE_VARS}
.for v in ${PROG_VARS:O:u}
Index: head/share/mk/bsd.sys.mk
===================================================================
--- head/share/mk/bsd.sys.mk
+++ head/share/mk/bsd.sys.mk
@@ -24,6 +24,19 @@
.else # CSTD
CFLAGS+= -std=${CSTD}
.endif # CSTD
+
+.if ${COMPILER_FEATURES:Mc++11}
+CXXSTD?= c++11
+.elif ${COMPILER_TYPE} == "gcc"
+# Prior versions of g++ support C++98 with GNU extensions by default.
+CXXSTD?= gnu++98
+.else
+# Assume that the compiler supports at least C++98.
+CXXSTD?= c++98
+.endif
+CXXFLAGS+= -std=${CXXSTD}
+# CXXSTD
+
# -pedantic is problematic because it also imposes namespace restrictions
#CFLAGS+= -pedantic
.if defined(WARNS)
Index: head/share/mk/googletest.test.inc.mk
===================================================================
--- head/share/mk/googletest.test.inc.mk
+++ head/share/mk/googletest.test.inc.mk
@@ -1,13 +1,9 @@
# $FreeBSD$
-# XXX: this should be defined in bsd.sys.mk
-CXXSTD?= c++11
-
GTESTS_CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1
GTESTS_CXXFLAGS+= -DGTEST_HAS_PTHREAD=1
GTESTS_CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1
GTESTS_CXXFLAGS+= -frtti
-GTESTS_CXXFLAGS+= -std=${CXXSTD}
# XXX: src.libnames.mk should handle adding this directory for libgtest's,
# libgmock's, etc, headers.
Index: head/usr.bin/dtc/Makefile
===================================================================
--- head/usr.bin/dtc/Makefile
+++ head/usr.bin/dtc/Makefile
@@ -6,7 +6,7 @@
WARNS?= 3
-CXXFLAGS+= -std=c++11 -fno-rtti -fno-exceptions
+CXXFLAGS+= -fno-rtti -fno-exceptions
NO_SHARED?=NO
Index: head/usr.sbin/pmc/Makefile
===================================================================
--- head/usr.sbin/pmc/Makefile
+++ head/usr.sbin/pmc/Makefile
@@ -6,7 +6,8 @@
PROG_CXX= pmc
MAN=
WARNS?= 3
-CXXFLAGS+= -O0 -std=c++14
+CXXFLAGS+= -O0
+CXXSTD= c++14
CWARNFLAGS.gcc+= -Wno-redundant-decls
LIBADD= kvm pmc m ncursesw pmcstat elf

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 4:07 AM (16 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14789400
Default Alt Text
D19732.diff (6 KB)

Event Timeline