svn commit: r346574 - in head: lib/libc++ lib/libc++experimental lib/libc++fs lib/libcxxrt lib/libgcc_eh lib/ofed/libibnetdisc usr.bin/dtc
Enji Cooper
ngie at FreeBSD.org
Mon Apr 22 18:38:57 UTC 2019
Author: ngie
Date: Mon Apr 22 18:38:54 2019
New Revision: 346574
URL: https://svnweb.freebsd.org/changeset/base/346574
Log:
Rework CXXSTD setting via r345708
This change allows the user to once again override the C++ standard, restoring
high-level pre-r345708 behavior.
This also unbreaks building lib/ofed/libibnetdisc/Makefile with a non-C++11
capable compiler, e.g., g++ 4.2.1, as the library supported being built with
older C++ standards.
MFC after: 2 weeks
MFC with: r345708
Reviewed by: emaste
Reported by: jbeich
Differential Revision: https://reviews.freebsd.org/D19895 (as part of a larger change)
Modified:
head/lib/libc++/Makefile
head/lib/libc++experimental/Makefile
head/lib/libc++fs/Makefile
head/lib/libcxxrt/Makefile
head/lib/libgcc_eh/Makefile.inc
head/lib/ofed/libibnetdisc/Makefile
head/usr.bin/dtc/Makefile
Modified: head/lib/libc++/Makefile
==============================================================================
--- head/lib/libc++/Makefile Mon Apr 22 18:33:32 2019 (r346573)
+++ head/lib/libc++/Makefile Mon Apr 22 18:38:54 2019 (r346574)
@@ -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: head/lib/libc++experimental/Makefile
==============================================================================
--- head/lib/libc++experimental/Makefile Mon Apr 22 18:33:32 2019 (r346573)
+++ head/lib/libc++experimental/Makefile Mon Apr 22 18:38:54 2019 (r346574)
@@ -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: head/lib/libc++fs/Makefile
==============================================================================
--- head/lib/libc++fs/Makefile Mon Apr 22 18:33:32 2019 (r346573)
+++ head/lib/libc++fs/Makefile Mon Apr 22 18:38:54 2019 (r346574)
@@ -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: head/lib/libcxxrt/Makefile
==============================================================================
--- head/lib/libcxxrt/Makefile Mon Apr 22 18:33:32 2019 (r346573)
+++ head/lib/libcxxrt/Makefile Mon Apr 22 18:38:54 2019 (r346574)
@@ -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: head/lib/libgcc_eh/Makefile.inc
==============================================================================
--- head/lib/libgcc_eh/Makefile.inc Mon Apr 22 18:33:32 2019 (r346573)
+++ head/lib/libgcc_eh/Makefile.inc Mon Apr 22 18:38:54 2019 (r346574)
@@ -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: head/lib/ofed/libibnetdisc/Makefile
==============================================================================
--- head/lib/ofed/libibnetdisc/Makefile Mon Apr 22 18:33:32 2019 (r346573)
+++ head/lib/ofed/libibnetdisc/Makefile Mon Apr 22 18:38:54 2019 (r346574)
@@ -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: head/usr.bin/dtc/Makefile
==============================================================================
--- head/usr.bin/dtc/Makefile Mon Apr 22 18:33:32 2019 (r346573)
+++ head/usr.bin/dtc/Makefile Mon Apr 22 18:38:54 2019 (r346574)
@@ -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-all
mailing list