svn commit: r346529 - in projects/runtime-coverage-v2: lib/libc++ lib/libc++experimental lib/libc++fs lib/libcxxrt lib/libgcc_eh lib/ofed/libibnetdisc share/mk usr.bin/dtc

[Enji Cooper]

Author: ngie
Date: Mon Apr 22 07:17:10 2019
New Revision: 346529
URL: https://svnweb.freebsd.org/changeset/base/346529

Log:
  Import patch from D19895 for reworking how CXXSTD is handled

Modified:
  projects/runtime-coverage-v2/lib/libc++/Makefile
  projects/runtime-coverage-v2/lib/libc++experimental/Makefile
  projects/runtime-coverage-v2/lib/libc++fs/Makefile
  projects/runtime-coverage-v2/lib/libcxxrt/Makefile
  projects/runtime-coverage-v2/lib/libgcc_eh/Makefile.inc
  projects/runtime-coverage-v2/lib/ofed/libibnetdisc/Makefile
  projects/runtime-coverage-v2/share/mk/bsd.sys.mk
  projects/runtime-coverage-v2/share/mk/googletest.test.inc.mk
  projects/runtime-coverage-v2/usr.bin/dtc/Makefile

Modified: projects/runtime-coverage-v2/lib/libc++/Makefile
==============================================================================
--- projects/runtime-coverage-v2/lib/libc++/Makefile	Mon Apr 22 07:13:11 2019	(r346528)
+++ projects/runtime-coverage-v2/lib/libc++/Makefile	Mon Apr 22 07:17:10 2019	(r346529)
@@ -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: projects/runtime-coverage-v2/lib/libc++experimental/Makefile
==============================================================================
--- projects/runtime-coverage-v2/lib/libc++experimental/Makefile	Mon Apr 22 07:13:11 2019	(r346528)
+++ projects/runtime-coverage-v2/lib/libc++experimental/Makefile	Mon Apr 22 07:17:10 2019	(r346529)
@@ -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: projects/runtime-coverage-v2/lib/libc++fs/Makefile
==============================================================================
--- projects/runtime-coverage-v2/lib/libc++fs/Makefile	Mon Apr 22 07:13:11 2019	(r346528)
+++ projects/runtime-coverage-v2/lib/libc++fs/Makefile	Mon Apr 22 07:17:10 2019	(r346529)
@@ -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: projects/runtime-coverage-v2/lib/libcxxrt/Makefile
==============================================================================
--- projects/runtime-coverage-v2/lib/libcxxrt/Makefile	Mon Apr 22 07:13:11 2019	(r346528)
+++ projects/runtime-coverage-v2/lib/libcxxrt/Makefile	Mon Apr 22 07:17:10 2019	(r346529)
@@ -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: projects/runtime-coverage-v2/lib/libgcc_eh/Makefile.inc
==============================================================================
--- projects/runtime-coverage-v2/lib/libgcc_eh/Makefile.inc	Mon Apr 22 07:13:11 2019	(r346528)
+++ projects/runtime-coverage-v2/lib/libgcc_eh/Makefile.inc	Mon Apr 22 07:17:10 2019	(r346529)
@@ -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: projects/runtime-coverage-v2/lib/ofed/libibnetdisc/Makefile
==============================================================================
--- projects/runtime-coverage-v2/lib/ofed/libibnetdisc/Makefile	Mon Apr 22 07:13:11 2019	(r346528)
+++ projects/runtime-coverage-v2/lib/ofed/libibnetdisc/Makefile	Mon Apr 22 07:17:10 2019	(r346529)
@@ -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: projects/runtime-coverage-v2/share/mk/bsd.sys.mk
==============================================================================
--- projects/runtime-coverage-v2/share/mk/bsd.sys.mk	Mon Apr 22 07:13:11 2019	(r346528)
+++ projects/runtime-coverage-v2/share/mk/bsd.sys.mk	Mon Apr 22 07:17:10 2019	(r346529)
@@ -25,17 +25,9 @@ CFLAGS+=	-std=iso9899:1999
 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
+.if !empty(CXXSTD)
 CXXFLAGS+=	-std=${CXXSTD}
-# CXXSTD
+.endif
 
 # -pedantic is problematic because it also imposes namespace restrictions
 #CFLAGS+=	-pedantic

Modified: projects/runtime-coverage-v2/share/mk/googletest.test.inc.mk
==============================================================================
--- projects/runtime-coverage-v2/share/mk/googletest.test.inc.mk	Mon Apr 22 07:13:11 2019	(r346528)
+++ projects/runtime-coverage-v2/share/mk/googletest.test.inc.mk	Mon Apr 22 07:17:10 2019	(r346529)
@@ -9,4 +9,6 @@ GTESTS_CXXFLAGS+= -frtti
 # libgmock's, etc, headers.
 CXXFLAGS+=	-I${DESTDIR}${INCLUDEDIR}/private
 
+CXXSTD?=	c++11
+
 NO_WTHREAD_SAFETY=

Modified: projects/runtime-coverage-v2/usr.bin/dtc/Makefile
==============================================================================
--- projects/runtime-coverage-v2/usr.bin/dtc/Makefile	Mon Apr 22 07:13:11 2019	(r346528)
+++ projects/runtime-coverage-v2/usr.bin/dtc/Makefile	Mon Apr 22 07:17:10 2019	(r346529)
@@ -8,6 +8,8 @@ WARNS?=	3
 
 CXXFLAGS+=	-fno-rtti -fno-exceptions
 
+CXXSTD=	c++11
+
 NO_SHARED?=NO
 
 .include <bsd.prog.mk>