Date: Tue, 19 Jan 2021 21:38:45 GMT From: Alex Richardson <arichardson@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: c1a3d7f20696 - main - Remove remaining uses of ${COMPILER_FEATURES:Mc++11} Message-ID: <202101192138.10JLcj1E078724@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=c1a3d7f20696ab5b72eee45863f3e04410d81fc8 commit c1a3d7f20696ab5b72eee45863f3e04410d81fc8 Author: Alex Richardson <arichardson@FreeBSD.org> AuthorDate: 2021-01-19 15:05:43 +0000 Commit: Alex Richardson <arichardson@FreeBSD.org> CommitDate: 2021-01-19 21:37:36 +0000 Remove remaining uses of ${COMPILER_FEATURES:Mc++11} All supported compilers have C++11 support so these checks can be replaced with MK_CXX guards. See also https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252759 PR: 252759 Reviewed By: emaste Differential Revision: https://reviews.freebsd.org/D28234 --- lib/libc/tests/stdlib/Makefile | 2 -- lib/ofed/libibnetdisc/Makefile | 2 -- usr.bin/Makefile | 4 +--- usr.sbin/Makefile | 4 +--- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile index da152159f8a8..bd85efcb1b95 100644 --- a/lib/libc/tests/stdlib/Makefile +++ b/lib/libc/tests/stdlib/Makefile @@ -11,10 +11,8 @@ ATF_TESTS_C+= qsort_s_test ATF_TESTS_C+= set_constraint_handler_s_test ATF_TESTS_C+= strfmon_test ATF_TESTS_C+= tsearch_test -.if ${COMPILER_FEATURES:Mc++11} ATF_TESTS_CXX+= cxa_thread_atexit_test ATF_TESTS_CXX+= cxa_thread_atexit_nothr_test -.endif # All architectures on FreeBSD have fenv.h CFLAGS+= -D__HAVE_FENV diff --git a/lib/ofed/libibnetdisc/Makefile b/lib/ofed/libibnetdisc/Makefile index 0736ae93f12f..0c43685fa236 100644 --- a/lib/ofed/libibnetdisc/Makefile +++ b/lib/ofed/libibnetdisc/Makefile @@ -31,9 +31,7 @@ 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> diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 8ea3b1c2bfe3..c557d85b535c 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -212,9 +212,7 @@ SUBDIR.${MK_GAMES}+= number SUBDIR.${MK_GAMES}+= pom SUBDIR.${MK_GAMES}+= primes SUBDIR.${MK_GAMES}+= random -.if ${COMPILER_FEATURES:Mc++11} -SUBDIR+= dtc -.endif +SUBDIR.${MK_CXX}+= dtc .if ${MK_GH_BC} == "yes" SUBDIR+= gh-bc .else diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index bd2f0cbe0797..2e01b0fcf847 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -186,9 +186,7 @@ SUBDIR.${MK_NTP}+= ntp SUBDIR.${MK_OPENSSL}+= keyserv SUBDIR.${MK_PF}+= ftp-proxy SUBDIR.${MK_PKGBOOTSTRAP}+= pkg -.if ${COMPILER_FEATURES:Mc++11} -SUBDIR.${MK_PMC}+= pmc -.endif +SUBDIR.${MK_PMC}.${MK_CXX}+= pmc SUBDIR.${MK_PMC}+= pmcannotate pmccontrol pmcstat pmcstudy SUBDIR.${MK_PORTSNAP}+= portsnap SUBDIR.${MK_PPP}+= ppp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101192138.10JLcj1E078724>