From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 08960158094 for ; Sun, 7 Aug 2022 17:53:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43113E0A92; Sun, 7 Aug 2022 17:53:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 034B5E0A92 for ; Sun, 7 Aug 2022 17:53:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E36AD340EFF for ; Sun, 7 Aug 2022 17:53:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1DC2951F for ; Sun, 7 Aug 2022 17:53:35 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1659894808.089297e7fc12562886e29253add293cd71df5bf7.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild X-VCS-Directories: sys-libs/compiler-rt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 089297e7fc12562886e29253add293cd71df5bf7 X-VCS-Branch: master Date: Sun, 7 Aug 2022 17:53:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2b55aa36-ad5d-486c-977b-0dd05add8e3d X-Archives-Hash: 3dc05e68c948f121277dfb4227a2d3b9 commit: 089297e7fc12562886e29253add293cd71df5bf7 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 7 17:50:46 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 7 17:53:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=089297e7 sys-libs/compiler-rt: Revert runtimes build for 15+ Revert to the regular compiler-rt build since the runtimes build did not solve the bootstrap problems as I anticipated. Signed-off-by: Michał Górny gentoo.org> sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild | 15 ++++++++++----- sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild index 8ef4aebf481d..8af221eaa8ad 100644 --- a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild @@ -32,7 +32,7 @@ BDEPEND=" ) " -LLVM_COMPONENTS=( runtimes compiler-rt cmake llvm/cmake ) +LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake ) LLVM_PATCHSET=9999-1 llvm.org_set_globals @@ -70,6 +70,7 @@ src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/${P}_build + local nolib_flags=( -nodefaultlibs -nostartfiles -lc ) if use clang; then # Only do this conditionally to allow overriding with # e.g. CC=clang-13 in case of breakage @@ -78,14 +79,18 @@ src_configure() { local -x CXX=${CHOST}-clang++ fi strip-unsupported-flags + # ensure we can use clang before installing compiler-rt + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + elif ! test_compiler; then + if test_compiler "${nolib_flags[@]}"; then + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" + fi fi local mycmakeargs=( - -DLLVM_ENABLE_RUNTIMES=compiler-rt - # this only adds unnecessary req on llvm-lit directory - -DLLVM_INCLUDE_TESTS=OFF - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) -DCOMPILER_RT_BUILD_LIBFUZZER=OFF -DCOMPILER_RT_BUILD_MEMPROF=OFF diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild index 8ef4aebf481d..8af221eaa8ad 100644 --- a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild @@ -32,7 +32,7 @@ BDEPEND=" ) " -LLVM_COMPONENTS=( runtimes compiler-rt cmake llvm/cmake ) +LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake ) LLVM_PATCHSET=9999-1 llvm.org_set_globals @@ -70,6 +70,7 @@ src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/${P}_build + local nolib_flags=( -nodefaultlibs -nostartfiles -lc ) if use clang; then # Only do this conditionally to allow overriding with # e.g. CC=clang-13 in case of breakage @@ -78,14 +79,18 @@ src_configure() { local -x CXX=${CHOST}-clang++ fi strip-unsupported-flags + # ensure we can use clang before installing compiler-rt + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + elif ! test_compiler; then + if test_compiler "${nolib_flags[@]}"; then + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" + fi fi local mycmakeargs=( - -DLLVM_ENABLE_RUNTIMES=compiler-rt - # this only adds unnecessary req on llvm-lit directory - -DLLVM_INCLUDE_TESTS=OFF - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) -DCOMPILER_RT_BUILD_LIBFUZZER=OFF -DCOMPILER_RT_BUILD_MEMPROF=OFF