Author: ngie
Date: Fri Mar 29 18:16:33 2019
New Revision: 345705
URL: https://svnweb.freebsd.org/changeset/base/345705
Log:
Revert r345704
I accidentally committed code from two reviews. I will reintroduce the code to
bsd.progs.mk as part of a separate commit from r345704.
Approved by: emaste (mentor, implicit)
MFC after: 2 months
MFC with: r345704
Modified:
head/lib/clang/llvm.build.mk
head/lib/libc++/Makefile
head/lib/libc++experimental/Makefile
head/lib/libc++fs/Makefile
head/lib/libc/tests/stdlib/Makefile
head/lib/libclang_rt/Makefile.inc
head/lib/libcxxrt/Makefile
head/lib/libgcc_eh/Makefile.inc
head/lib/libomp/Makefile
head/lib/ofed/libibnetdisc/Makefile
head/share/mk/bsd.progs.mk
head/share/mk/bsd.sys.mk
head/share/mk/googletest.test.inc.mk
head/usr.bin/dtc/Makefile
head/usr.sbin/pmc/Makefile
Modified: head/lib/clang/llvm.build.mk
==============================================================================
--- head/lib/clang/llvm.build.mk Fri Mar 29 18:13:44 2019
(r345704)
+++ head/lib/clang/llvm.build.mk Fri Mar 29 18:16:33 2019
(r345705)
@@ -95,7 +95,7 @@ CFLAGS+= -ffunction-sections
CFLAGS+= -fdata-sections
LDFLAGS+= -Wl,--gc-sections
-CXXSTD?= c++11
+CXXFLAGS+= -std=c++11
CXXFLAGS+= -fno-exceptions
CXXFLAGS+= -fno-rtti
CXXFLAGS.clang+= -stdlib=libc++
Modified: head/lib/libc++/Makefile
==============================================================================
--- head/lib/libc++/Makefile Fri Mar 29 18:13:44 2019 (r345704)
+++ head/lib/libc++/Makefile Fri Mar 29 18:16:33 2019 (r345705)
@@ -76,7 +76,9 @@ CFLAGS+= -nostdinc++
CFLAGS+= -nostdlib
CFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
CFLAGS+= -DLIBCXXRT
-CXXSTD= c++11
+.if empty(CXXFLAGS:M-std=*)
+CXXFLAGS+= -std=c++11
+.endif
LIBADD+= cxxrt
INCSGROUPS= STD EXP EXT
Modified: head/lib/libc++experimental/Makefile
==============================================================================
--- head/lib/libc++experimental/Makefile Fri Mar 29 18:13:44 2019
(r345704)
+++ head/lib/libc++experimental/Makefile Fri Mar 29 18:16:33 2019
(r345705)
@@ -20,6 +20,8 @@ CXXFLAGS+= -nostdinc++
CXXFLAGS+= -nostdlib
CXXFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
CXXFLAGS+= -DLIBCXXRT
-CXXSTD= c++14
+.if empty(CXXFLAGS:M-std=*)
+CXXFLAGS+= -std=c++14
+.endif
.include <bsd.lib.mk>
Modified: head/lib/libc++fs/Makefile
==============================================================================
--- head/lib/libc++fs/Makefile Fri Mar 29 18:13:44 2019 (r345704)
+++ head/lib/libc++fs/Makefile Fri Mar 29 18:16:33 2019 (r345705)
@@ -22,6 +22,8 @@ CXXFLAGS+= -nostdinc++
CXXFLAGS+= -nostdlib
CXXFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
CXXFLAGS+= -DLIBCXXRT
-CXXSTD= c++14
+.if empty(CXXFLAGS:M-std=*)
+CXXFLAGS+= -std=c++14
+.endif
.include <bsd.lib.mk>
Modified: head/lib/libc/tests/stdlib/Makefile
==============================================================================
--- head/lib/libc/tests/stdlib/Makefile Fri Mar 29 18:13:44 2019
(r345704)
+++ head/lib/libc/tests/stdlib/Makefile Fri Mar 29 18:16:33 2019
(r345705)
@@ -50,8 +50,8 @@ PROGS+= h_getopt h_getopt_long
CFLAGS+= -I${.CURDIR}
-CXXSTD.cxa_thread_atexit_test= c++11
-CXXSTD.cxa_thread_atexit_nothr_test= c++11
+CXXFLAGS.cxa_thread_atexit_test+= -std=c++11
+CXXFLAGS.cxa_thread_atexit_nothr_test+= -std=c++11
LIBADD.cxa_thread_atexit_test+= pthread
.for t in h_getopt h_getopt_long
Modified: head/lib/libclang_rt/Makefile.inc
==============================================================================
--- head/lib/libclang_rt/Makefile.inc Fri Mar 29 18:13:44 2019
(r345704)
+++ head/lib/libclang_rt/Makefile.inc Fri Mar 29 18:16:33 2019
(r345705)
@@ -41,4 +41,4 @@ CFLAGS+= -funwind-tables
CXXFLAGS+= -fvisibility-inlines-hidden
CXXFLAGS+= -fvisibility=hidden
CFLAGS+= -I${CRTSRC}/lib
-CXXSTD= c++11
+CXXFLAGS+= -std=c++11
Modified: head/lib/libcxxrt/Makefile
==============================================================================
--- head/lib/libcxxrt/Makefile Fri Mar 29 18:13:44 2019 (r345704)
+++ head/lib/libcxxrt/Makefile Fri Mar 29 18:16:33 2019 (r345705)
@@ -22,7 +22,9 @@ SRCS+= libelftc_dem_gnu3.c\
WARNS= 0
CFLAGS+= -isystem ${SRCDIR} -nostdinc++
-CXXSTD= c++11
+.if empty(CXXFLAGS:M-std=*)
+CXXFLAGS+= -std=c++11
+.endif
VERSION_MAP= ${.CURDIR}/Version.map
.include <bsd.lib.mk>
Modified: head/lib/libgcc_eh/Makefile.inc
==============================================================================
--- head/lib/libgcc_eh/Makefile.inc Fri Mar 29 18:13:44 2019
(r345704)
+++ head/lib/libgcc_eh/Makefile.inc Fri Mar 29 18:16:33 2019
(r345705)
@@ -27,8 +27,10 @@ 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"
Modified: head/lib/libomp/Makefile
==============================================================================
--- head/lib/libomp/Makefile Fri Mar 29 18:13:44 2019 (r345704)
+++ head/lib/libomp/Makefile Fri Mar 29 18:16:33 2019 (r345705)
@@ -53,9 +53,9 @@ CFLAGS+= -I${ITTSRC}
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
Modified: head/lib/ofed/libibnetdisc/Makefile
==============================================================================
--- head/lib/ofed/libibnetdisc/Makefile Fri Mar 29 18:13:44 2019
(r345704)
+++ head/lib/ofed/libibnetdisc/Makefile Fri Mar 29 18:16:33 2019
(r345705)
@@ -31,6 +31,9 @@ LIBADD= osmcomp ibmad ibumad
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>
Modified: head/share/mk/bsd.progs.mk
==============================================================================
--- head/share/mk/bsd.progs.mk Fri Mar 29 18:13:44 2019 (r345704)
+++ head/share/mk/bsd.progs.mk Fri Mar 29 18:16:33 2019 (r345705)
@@ -22,8 +22,8 @@ PROGS += ${PROGS_CXX}
.if defined(PROG)
# just one of many
-PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE CSTD CXXSTD DPSRCS MAN \
- NO_WERROR PROGNAME SRCS STRIP WARNS
+PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE 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}
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Fri Mar 29 18:13:44 2019 (r345704)
+++ head/share/mk/bsd.sys.mk Fri Mar 29 18:16:33 2019 (r345705)
@@ -24,19 +24,6 @@ CFLAGS+= -std=iso9899:1999
.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)
Modified: head/share/mk/googletest.test.inc.mk
==============================================================================
--- head/share/mk/googletest.test.inc.mk Fri Mar 29 18:13:44 2019
(r345704)
+++ head/share/mk/googletest.test.inc.mk Fri Mar 29 18:16:33 2019
(r345705)
@@ -1,9 +1,13 @@
# $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.
Modified: head/usr.bin/dtc/Makefile
==============================================================================
--- head/usr.bin/dtc/Makefile Fri Mar 29 18:13:44 2019 (r345704)
+++ head/usr.bin/dtc/Makefile Fri Mar 29 18:16:33 2019 (r345705)
@@ -6,7 +6,7 @@ MAN= dtc.1
WARNS?= 3
-CXXFLAGS+= -fno-rtti -fno-exceptions
+CXXFLAGS+= -std=c++11 -fno-rtti -fno-exceptions
NO_SHARED?=NO
Modified: head/usr.sbin/pmc/Makefile
==============================================================================
--- head/usr.sbin/pmc/Makefile Fri Mar 29 18:13:44 2019 (r345704)
+++ head/usr.sbin/pmc/Makefile Fri Mar 29 18:16:33 2019 (r345705)
@@ -6,8 +6,7 @@
PROG_CXX= pmc
MAN=
WARNS?= 3
-CXXFLAGS+= -O0
-CXXSTD= c++14
+CXXFLAGS+= -O0 -std=c++14
CWARNFLAGS.gcc+= -Wno-redundant-decls
LIBADD= kvm pmc m ncursesw pmcstat elf
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
