| 1 |
commit: 755d296048de0477d2608299f6e5f9dcb5ec1af4 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 1 05:59:29 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 1 06:00:22 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=755d2960 |
| 7 |
|
| 8 |
sys-libs/compiler-rt: Try the runtimes build for 15.x |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild | 15 +++++---------- |
| 13 |
1 file changed, 5 insertions(+), 10 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
index 8af221eaa8ad..8ef4aebf481d 100644 |
| 17 |
--- a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild |
| 18 |
+++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild |
| 19 |
@@ -32,7 +32,7 @@ BDEPEND=" |
| 20 |
) |
| 21 |
" |
| 22 |
|
| 23 |
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake ) |
| 24 |
+LLVM_COMPONENTS=( runtimes compiler-rt cmake llvm/cmake ) |
| 25 |
LLVM_PATCHSET=9999-1 |
| 26 |
llvm.org_set_globals |
| 27 |
|
| 28 |
@@ -70,7 +70,6 @@ src_configure() { |
| 29 |
# pre-set since we need to pass it to cmake |
| 30 |
BUILD_DIR=${WORKDIR}/${P}_build |
| 31 |
|
| 32 |
- local nolib_flags=( -nodefaultlibs -nostartfiles -lc ) |
| 33 |
if use clang; then |
| 34 |
# Only do this conditionally to allow overriding with |
| 35 |
# e.g. CC=clang-13 in case of breakage |
| 36 |
@@ -79,18 +78,14 @@ src_configure() { |
| 37 |
local -x CXX=${CHOST}-clang++ |
| 38 |
fi |
| 39 |
strip-unsupported-flags |
| 40 |
- # ensure we can use clang before installing compiler-rt |
| 41 |
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 42 |
- elif ! test_compiler; then |
| 43 |
- if test_compiler "${nolib_flags[@]}"; then |
| 44 |
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 45 |
- ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" |
| 46 |
- fi |
| 47 |
fi |
| 48 |
|
| 49 |
local mycmakeargs=( |
| 50 |
- -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" |
| 51 |
+ -DLLVM_ENABLE_RUNTIMES=compiler-rt |
| 52 |
+ # this only adds unnecessary req on llvm-lit directory |
| 53 |
+ -DLLVM_INCLUDE_TESTS=OFF |
| 54 |
|
| 55 |
+ -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" |
| 56 |
-DCOMPILER_RT_INCLUDE_TESTS=$(usex test) |
| 57 |
-DCOMPILER_RT_BUILD_LIBFUZZER=OFF |
| 58 |
-DCOMPILER_RT_BUILD_MEMPROF=OFF |
Archives