Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Oct 2017 16:08:19 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r324924 - projects/runtime-coverage
Message-ID:  <201710231608.v9NG8JHH032262@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Mon Oct 23 16:08:19 2017
New Revision: 324924
URL: https://svnweb.freebsd.org/changeset/base/324924

Log:
  Diff reduce and try to apply MK_COVERAGE only against c++11 compilers
  
  Hashtag crossesFingersAndHopeThisVoodooWorks

Modified:
  projects/runtime-coverage/Makefile.inc1

Modified: projects/runtime-coverage/Makefile.inc1
==============================================================================
--- projects/runtime-coverage/Makefile.inc1	Mon Oct 23 16:02:48 2017	(r324923)
+++ projects/runtime-coverage/Makefile.inc1	Mon Oct 23 16:08:19 2017	(r324924)
@@ -558,8 +558,8 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} MK_GDB=no \
-		MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no
 
 # kernel-tools stage
 KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -2258,11 +2258,10 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared
 # for world to have runtime coverage instrumentation.
 #
 .if ${MK_COVERAGE} != "no"
-.if ${MK_CLANG} != "no"
+.if ${X_COMPILER_FEATURES:Mc++11}
 _prereq_libs+=	lib/libclang_rt/profile
 .else
-.error "Runtime coverage is only supported with clang"
-.endif
+.error "Runtime coverage is only supported with c++11 capable compilers"
 .endif
 
 # These dependencies are not automatically generated:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710231608.v9NG8JHH032262>