From owner-svn-src-projects@freebsd.org Fri Apr 26 07:43:39 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16B36158C234 for ; Fri, 26 Apr 2019 07:43:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C69F987A8C; Fri, 26 Apr 2019 07:43:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A5C818687; Fri, 26 Apr 2019 07:43:38 +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 x3Q7hc9g006616; Fri, 26 Apr 2019 07:43:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3Q7hc6u006615; Fri, 26 Apr 2019 07:43:38 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904260743.x3Q7hc6u006615@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Fri, 26 Apr 2019 07:43:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r346732 - projects/runtime-coverage-v2 X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage-v2 X-SVN-Commit-Revision: 346732 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C69F987A8C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 26 Apr 2019 07:43:39 -0000 Author: ngie Date: Fri Apr 26 07:43:38 2019 New Revision: 346732 URL: https://svnweb.freebsd.org/changeset/base/346732 Log: Retry building lib/libclang_rt/profile for buildworld Building lib/libclang_rt/profile doesn't work with _libraries; try to compile it with cross-tools instead after passing along --target=, etc. Modified: projects/runtime-coverage-v2/Makefile.inc1 Modified: projects/runtime-coverage-v2/Makefile.inc1 ============================================================================== --- projects/runtime-coverage-v2/Makefile.inc1 Fri Apr 26 06:58:40 2019 (r346731) +++ projects/runtime-coverage-v2/Makefile.inc1 Fri Apr 26 07:43:38 2019 (r346732) @@ -722,7 +722,7 @@ TMAKE= \ XMAKE= ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ MK_GDB=no \ - MK_TESTS=no MK_COVERAGE=no + MK_TESTS=no MK_COVERAGE=no MK_COVERAGE_SUPPORT=${MK_COVERAGE} # kernel-tools stage KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -786,7 +786,7 @@ BFLAGS+= -B${WORLDTMP}/usr/bin (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) .elif ${WANT_COMPILER_TYPE} == clang || \ (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang) -XCFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= -target=${TARGET_TRIPLE} .endif XCFLAGS+= --sysroot=${WORLDTMP} @@ -1117,7 +1117,6 @@ _libraries: ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG MK_HTML=no -DNO_LINT MK_MAN=no \ MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS} \ - MK_COVERAGE=no MK_COVERAGE_SUPPORT=${MK_COVERAGE} \ libraries everything: .PHONY @echo @@ -2467,6 +2466,9 @@ _elftctools= lib/libelftc \ .endif .if ${MK_CLANG_BOOTSTRAP} != "no" +.if ${MK_COVERAGE_SUPPORT} != "no" +_coverage_libs+= lib/clang_rt/profile +.endif _clang= usr.bin/clang .endif .if ${MK_LLD_BOOTSTRAP} != "no" @@ -2505,6 +2507,15 @@ cross-tools: .MAKE .PHONY ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install .endfor +.for _tool in ${_coverage_libs} + ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ + cd ${.CURDIR}/${_tool}; \ + if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ + ${MAKE} CFLAGS="${XCFLAGS:M*target=} ${CFLAGS}" \ + DIRPRFX=${_tool}/ all; \ + ${MAKE} CFLAGS="${XCFLAGS:M*target=} ${CFLAGS}" \ + DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install +.endif # # native-xtools is the current target for qemu-user cross builds of ports @@ -2719,16 +2730,6 @@ libraries: .MAKE .PHONY _prereq_libs= lib/libcompiler_rt .if ${MK_SSP} != "no" _prereq_libs+= gnu/lib/libssp/libssp_nonshared -.endif - -# -# The coverage libraries must be built for the target prior to ${_startup_libs} -# for world to have runtime coverage instrumentation. -# -.if ${MK_COVERAGE_SUPPORT} != "no" -.if ${MK_CLANG} != "no" -_prereq_libs+= lib/libclang_rt/profile -.endif .endif # These dependencies are not automatically generated: