| 1 |
commit: 62394fcca76f4c6b433884a3d48a84ae7b775600 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 9 08:16:54 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 9 21:33:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62394fcc |
| 7 |
|
| 8 |
sys-libs/compiler-rt: Simplify -- use common nolib flag var |
| 9 |
|
| 10 |
sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild | 10 +++++----- |
| 11 |
sys-libs/compiler-rt/compiler-rt-9999.ebuild | 10 +++++----- |
| 12 |
2 files changed, 10 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild |
| 15 |
index 00141f900ff..98d9f66212b 100644 |
| 16 |
--- a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild |
| 17 |
+++ b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild |
| 18 |
@@ -48,17 +48,17 @@ src_configure() { |
| 19 |
# pre-set since we need to pass it to cmake |
| 20 |
BUILD_DIR=${WORKDIR}/${P}_build |
| 21 |
|
| 22 |
+ local nolib_flags=( -nodefaultlibs -lc ) |
| 23 |
if use clang; then |
| 24 |
local -x CC=${CHOST}-clang |
| 25 |
local -x CXX=${CHOST}-clang++ |
| 26 |
# ensure we can use clang before installing compiler-rt |
| 27 |
- local -x LDFLAGS="${LDFLAGS} -nodefaultlibs -lc" |
| 28 |
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 29 |
strip-unsupported-flags |
| 30 |
elif ! test_compiler; then |
| 31 |
- local extra_flags=( -nodefaultlibs -lc ) |
| 32 |
- if test_compiler "${extra_flags[@]}"; then |
| 33 |
- local -x LDFLAGS="${LDFLAGS} ${extra_flags[*]}" |
| 34 |
- ewarn "${CC} seems to lack runtime, trying with ${extra_flags[*]}" |
| 35 |
+ if test_compiler "${nolib_flags[@]}"; then |
| 36 |
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 37 |
+ ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" |
| 38 |
fi |
| 39 |
fi |
| 40 |
|
| 41 |
|
| 42 |
diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild |
| 43 |
index 4758eab553a..ffd1e9eddb3 100644 |
| 44 |
--- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild |
| 45 |
+++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild |
| 46 |
@@ -49,17 +49,17 @@ src_configure() { |
| 47 |
# pre-set since we need to pass it to cmake |
| 48 |
BUILD_DIR=${WORKDIR}/${P}_build |
| 49 |
|
| 50 |
+ local nolib_flags=( -nodefaultlibs -lc ) |
| 51 |
if use clang; then |
| 52 |
local -x CC=${CHOST}-clang |
| 53 |
local -x CXX=${CHOST}-clang++ |
| 54 |
# ensure we can use clang before installing compiler-rt |
| 55 |
- local -x LDFLAGS="${LDFLAGS} -nodefaultlibs -lc" |
| 56 |
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 57 |
strip-unsupported-flags |
| 58 |
elif ! test_compiler; then |
| 59 |
- local extra_flags=( -nodefaultlibs -lc ) |
| 60 |
- if test_compiler "${extra_flags[@]}"; then |
| 61 |
- local -x LDFLAGS="${LDFLAGS} ${extra_flags[*]}" |
| 62 |
- ewarn "${CC} seems to lack runtime, trying with ${extra_flags[*]}" |
| 63 |
+ if test_compiler "${nolib_flags[@]}"; then |
| 64 |
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 65 |
+ ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" |
| 66 |
fi |
| 67 |
fi |
Archives