From owner-svn-src-projects@freebsd.org Sun Oct 22 21:39:59 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 99592E36A77 for ; Sun, 22 Oct 2017 21:39:59 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6767175C22; Sun, 22 Oct 2017 21:39:59 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MLdwol072371; Sun, 22 Oct 2017 21:39:58 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MLdwD2072370; Sun, 22 Oct 2017 21:39:58 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710222139.v9MLdwD2072370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sun, 22 Oct 2017 21:39:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324874 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 324874 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Oct 2017 21:39:59 -0000 Author: ngie Date: Sun Oct 22 21:39:58 2017 New Revision: 324874 URL: https://svnweb.freebsd.org/changeset/base/324874 Log: Remove BROKEN_OPTIONS/MK_COVERAGE=no for gcc cross-toolchain reliant archs The cross-toolchain gcc toolchains aren't installing libgcov.a, but the host toolchain variants are. Don't hack around broken packages in the base system. PR: 223174 Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Sun Oct 22 21:34:37 2017 (r324873) +++ projects/runtime-coverage/share/mk/src.opts.mk Sun Oct 22 21:39:58 2017 (r324874) @@ -240,7 +240,6 @@ BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BO .endif .if ${__T:Mriscv*} != "" BROKEN_OPTIONS+=PROFILE # "sorry, unimplemented: profiler support for RISC-V" -BROKEN_OPTIONS+=COVERAGE # External toolchain (GNU-based) doesn't have libgcov.a . BROKEN_OPTIONS+=TESTS # "undefined reference to `_Unwind_Resume'" BROKEN_OPTIONS+=CXX # "libcxxrt.so: undefined reference to `_Unwind_Resume_or_Rethrow'" .endif @@ -292,10 +291,6 @@ __DEFAULT_YES_OPTIONS+=CXGBETOOL .else __DEFAULT_NO_OPTIONS+=CXGBETOOL .endif -.if ${__T} == "aarch64" || ${__T} == "arm" || ${__T} == "armeb" || \ - ${__T} == "armv6" || ${__T} == "armv7" -BROKEN_OPTIONS+=COVERAGE -.endif .include @@ -473,9 +468,7 @@ MK_${var}_SUPPORT:= yes MK_LLDB:= no .endif -.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800 -# Cross-toolchains unfortunately don't install libgcov.a . -MK_COVERAGE:=no +.if ${COMPILER_TYPE} == "gcc" # gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case. # while in theory we could build it with that, we don't want to do # that since it creates too much confusion for too little gain.