| 1 |
commit: da1b2fc8251c571f43813ecf04522aba75333df2 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 7 17:52:47 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 7 17:53:29 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1b2fc8 |
| 7 |
|
| 8 |
sys-libs/compiler-rt: Sync 15+ to 14.0.6-r1 |
| 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 |
sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild | 15 +++++++++++---- |
| 14 |
2 files changed, 22 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
index 8af221eaa8ad..9330ad9834cf 100644 |
| 18 |
--- a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild |
| 19 |
+++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild |
| 20 |
@@ -70,7 +70,6 @@ src_configure() { |
| 21 |
# pre-set since we need to pass it to cmake |
| 22 |
BUILD_DIR=${WORKDIR}/${P}_build |
| 23 |
|
| 24 |
- local nolib_flags=( -nodefaultlibs -nostartfiles -lc ) |
| 25 |
if use clang; then |
| 26 |
# Only do this conditionally to allow overriding with |
| 27 |
# e.g. CC=clang-13 in case of breakage |
| 28 |
@@ -78,13 +77,21 @@ src_configure() { |
| 29 |
local -x CC=${CHOST}-clang |
| 30 |
local -x CXX=${CHOST}-clang++ |
| 31 |
fi |
| 32 |
+ |
| 33 |
strip-unsupported-flags |
| 34 |
- # ensure we can use clang before installing compiler-rt |
| 35 |
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 36 |
- elif ! test_compiler; then |
| 37 |
+ fi |
| 38 |
+ |
| 39 |
+ if ! test_compiler; then |
| 40 |
+ local nolib_flags=( -nodefaultlibs -lc ) |
| 41 |
+ |
| 42 |
if test_compiler "${nolib_flags[@]}"; then |
| 43 |
local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 44 |
ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" |
| 45 |
+ elif test_compiler "${nolib_flags[@]}" -nostartfiles; then |
| 46 |
+ # Avoiding -nostartfiles earlier on for bug #862540 |
| 47 |
+ nolib_flags+=( -nostartfiles ) |
| 48 |
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 49 |
+ ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" |
| 50 |
fi |
| 51 |
fi |
| 52 |
|
| 53 |
|
| 54 |
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 |
| 55 |
index 8af221eaa8ad..9330ad9834cf 100644 |
| 56 |
--- a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild |
| 57 |
+++ b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild |
| 58 |
@@ -70,7 +70,6 @@ src_configure() { |
| 59 |
# pre-set since we need to pass it to cmake |
| 60 |
BUILD_DIR=${WORKDIR}/${P}_build |
| 61 |
|
| 62 |
- local nolib_flags=( -nodefaultlibs -nostartfiles -lc ) |
| 63 |
if use clang; then |
| 64 |
# Only do this conditionally to allow overriding with |
| 65 |
# e.g. CC=clang-13 in case of breakage |
| 66 |
@@ -78,13 +77,21 @@ src_configure() { |
| 67 |
local -x CC=${CHOST}-clang |
| 68 |
local -x CXX=${CHOST}-clang++ |
| 69 |
fi |
| 70 |
+ |
| 71 |
strip-unsupported-flags |
| 72 |
- # ensure we can use clang before installing compiler-rt |
| 73 |
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 74 |
- elif ! test_compiler; then |
| 75 |
+ fi |
| 76 |
+ |
| 77 |
+ if ! test_compiler; then |
| 78 |
+ local nolib_flags=( -nodefaultlibs -lc ) |
| 79 |
+ |
| 80 |
if test_compiler "${nolib_flags[@]}"; then |
| 81 |
local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 82 |
ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" |
| 83 |
+ elif test_compiler "${nolib_flags[@]}" -nostartfiles; then |
| 84 |
+ # Avoiding -nostartfiles earlier on for bug #862540 |
| 85 |
+ nolib_flags+=( -nostartfiles ) |
| 86 |
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 87 |
+ ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" |
| 88 |
fi |
| 89 |
fi |
Archives