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 1D803158094 for ; Mon, 1 Aug 2022 06:00:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDB0EE10BF; Mon, 1 Aug 2022 06:00:27 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CCD26E10BF for ; Mon, 1 Aug 2022 06:00:27 +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 A3BD0340E31 for ; Mon, 1 Aug 2022 06:00:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E41D47F for ; Mon, 1 Aug 2022 06:00:24 +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: <1659333622.755d296048de0477d2608299f6e5f9dcb5ec1af4.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 X-VCS-Directories: sys-libs/compiler-rt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 755d296048de0477d2608299f6e5f9dcb5ec1af4 X-VCS-Branch: master Date: Mon, 1 Aug 2022 06:00:24 +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: 8af57e43-9ec7-4df2-b864-56af987012bc X-Archives-Hash: f2b05fc9d51effcfb2912995491e4aa5 commit: 755d296048de0477d2608299f6e5f9dcb5ec1af4 Author: Michał Górny gentoo org> AuthorDate: Mon Aug 1 05:59:29 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Aug 1 06:00:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=755d2960 sys-libs/compiler-rt: Try the runtimes build for 15.x Signed-off-by: Michał Górny gentoo.org> sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild | 15 +++++---------- 1 file changed, 5 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 8af221eaa8ad..8ef4aebf481d 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=( compiler-rt cmake llvm/cmake ) +LLVM_COMPONENTS=( runtimes compiler-rt cmake llvm/cmake ) LLVM_PATCHSET=9999-1 llvm.org_set_globals @@ -70,7 +70,6 @@ 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 @@ -79,18 +78,14 @@ 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=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + -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