svn commit: r346107 - in user/ngie/fix-up-cxxstd: lib/libc++ lib/libc++experimental lib/libc++fs lib/libcxxrt lib/libgcc_eh lib/ofed/libibnetdisc share/mk usr.bin/dtc
Enji Cooper
ngie at FreeBSD.org
Tue Sep 3 14:06:40 UTC 2019
Author: ngie
Date: Wed Apr 10 22:16:50 2019
New Revision: 346107
URL: https://svnweb.freebsd.org/changeset/base/346107
Log:
Set the C++ standard in a manner similar to how it was set, pre-r345708
Some cases overrode -std if specified; some cases would be overridden if
specified. Be bug compatible.
Modified:
user/ngie/fix-up-cxxstd/lib/libc++/Makefile
user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile
user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile
user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile
user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc
user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile
user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk
user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile
Modified: user/ngie/fix-up-cxxstd/lib/libc++/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/libc++/Makefile Wed Apr 10 21:46:59 2019 (r346106)
+++ user/ngie/fix-up-cxxstd/lib/libc++/Makefile Wed Apr 10 22:16:50 2019 (r346107)
@@ -76,7 +76,7 @@ CFLAGS+= -nostdinc++
CFLAGS+= -nostdlib
CFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
CFLAGS+= -DLIBCXXRT
-CXXSTD= c++11
+CXXSTD?= c++11
LIBADD+= cxxrt
INCSGROUPS= STD EXP EXT
Modified: user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile Wed Apr 10 21:46:59 2019 (r346106)
+++ user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile Wed Apr 10 22:16:50 2019 (r346107)
@@ -20,6 +20,6 @@ CXXFLAGS+= -nostdinc++
CXXFLAGS+= -nostdlib
CXXFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
CXXFLAGS+= -DLIBCXXRT
-CXXSTD= c++14
+CXXSTD?= c++14
.include <bsd.lib.mk>
Modified: user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile Wed Apr 10 21:46:59 2019 (r346106)
+++ user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile Wed Apr 10 22:16:50 2019 (r346107)
@@ -22,6 +22,6 @@ CXXFLAGS+= -nostdinc++
CXXFLAGS+= -nostdlib
CXXFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
CXXFLAGS+= -DLIBCXXRT
-CXXSTD= c++14
+CXXSTD?= c++14
.include <bsd.lib.mk>
Modified: user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile Wed Apr 10 21:46:59 2019 (r346106)
+++ user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile Wed Apr 10 22:16:50 2019 (r346107)
@@ -22,7 +22,7 @@ SRCS+= libelftc_dem_gnu3.c\
WARNS= 0
CFLAGS+= -isystem ${SRCDIR} -nostdinc++
-CXXSTD= c++11
+CXXSTD?= c++11
VERSION_MAP= ${.CURDIR}/Version.map
.include <bsd.lib.mk>
Modified: user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc Wed Apr 10 21:46:59 2019 (r346106)
+++ user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc Wed Apr 10 22:16:50 2019 (r346107)
@@ -28,7 +28,7 @@ CXXFLAGS.${file}+= -fno-exceptions -funwind-tables
CFLAGS+= -I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY
CXXFLAGS+= -fno-rtti
-CXXSTD= c++11
+CXXSTD?= c++11
STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
# Probably need to just move this earlier or use CXXFLAGS
.if ${MK_DIRDEPS_BUILD} == "yes"
Modified: user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile Wed Apr 10 21:46:59 2019 (r346106)
+++ user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile Wed Apr 10 22:16:50 2019 (r346107)
@@ -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}
+CXXSTD= c++11
+.endif
VERSION_MAP= ${_spath}/libibnetdisc.map
.include <bsd.lib.mk>
Modified: user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk
==============================================================================
--- user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk Wed Apr 10 21:46:59 2019 (r346106)
+++ user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk Wed Apr 10 22:16:50 2019 (r346107)
@@ -9,4 +9,6 @@ GTESTS_CXXFLAGS+= -frtti
# libgmock's, etc, headers.
CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private
+CXXSTD?= c++11
+
NO_WTHREAD_SAFETY=
Modified: user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile Wed Apr 10 21:46:59 2019 (r346106)
+++ user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile Wed Apr 10 22:16:50 2019 (r346107)
@@ -8,6 +8,8 @@ WARNS?= 3
CXXFLAGS+= -fno-rtti -fno-exceptions
+CXXSTD= c++11
+
NO_SHARED?=NO
.include <bsd.prog.mk>
More information about the svn-src-user
mailing list