[gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/

[Michał Górny]

commit:     62394fcca76f4c6b433884a3d48a84ae7b775600
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 08:16:54 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 21:33:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62394fcc

sys-libs/compiler-rt: Simplify -- use common nolib flag var

 sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild | 10 +++++-----
 sys-libs/compiler-rt/compiler-rt-9999.ebuild  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild 
b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
index 00141f900ff..98d9f66212b 100644
--- a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
@@ -48,17 +48,17 @@ src_configure() {
        # pre-set since we need to pass it to cmake
        BUILD_DIR=${WORKDIR}/${P}_build
 
+       local nolib_flags=( -nodefaultlibs -lc )
        if use clang; then
                local -x CC=${CHOST}-clang
                local -x CXX=${CHOST}-clang++
                # ensure we can use clang before installing compiler-rt
-               local -x LDFLAGS="${LDFLAGS} -nodefaultlibs -lc"
+               local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
                strip-unsupported-flags
        elif ! test_compiler; then
-               local extra_flags=( -nodefaultlibs -lc )
-               if test_compiler "${extra_flags[@]}"; then
-                       local -x LDFLAGS="${LDFLAGS} ${extra_flags[*]}"
-                       ewarn "${CC} seems to lack runtime, trying with 
${extra_flags[*]}"
+               if test_compiler "${nolib_flags[@]}"; then
+                       local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+                       ewarn "${CC} seems to lack runtime, trying with 
${nolib_flags[*]}"
                fi
        fi
 

diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild 
b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
index 4758eab553a..ffd1e9eddb3 100644
--- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
@@ -49,17 +49,17 @@ src_configure() {
        # pre-set since we need to pass it to cmake
        BUILD_DIR=${WORKDIR}/${P}_build
 
+       local nolib_flags=( -nodefaultlibs -lc )
        if use clang; then
                local -x CC=${CHOST}-clang
                local -x CXX=${CHOST}-clang++
                # ensure we can use clang before installing compiler-rt
-               local -x LDFLAGS="${LDFLAGS} -nodefaultlibs -lc"
+               local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
                strip-unsupported-flags
        elif ! test_compiler; then
-               local extra_flags=( -nodefaultlibs -lc )
-               if test_compiler "${extra_flags[@]}"; then
-                       local -x LDFLAGS="${LDFLAGS} ${extra_flags[*]}"
-                       ewarn "${CC} seems to lack runtime, trying with 
${extra_flags[*]}"
+               if test_compiler "${nolib_flags[@]}"; then
+                       local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+                       ewarn "${CC} seems to lack runtime, trying with 
${nolib_flags[*]}"
                fi
        fi