From 8e283ddd7e7cfd33203278872556a5b7db34eaa1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 29 Jan 2020 09:47:41 +0100 Subject: [PATCH] sys-libs/compiler-rt: Fix stripping -nodefaultlibs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/706266 Signed-off-by: Michał Górny --- sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild | 2 +- sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild | 2 +- sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild | 2 +- sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild | 2 +- sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild index b5eea1980e7d..fb90bbaab7cf 100644 --- a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild @@ -62,9 +62,9 @@ src_configure() { if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ + strip-unsupported-flags # ensure we can use clang before installing compiler-rt local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" - strip-unsupported-flags elif ! test_compiler; then if test_compiler "${nolib_flags[@]}"; then local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild index b5eea1980e7d..fb90bbaab7cf 100644 --- a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild @@ -62,9 +62,9 @@ src_configure() { if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ + strip-unsupported-flags # ensure we can use clang before installing compiler-rt local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" - strip-unsupported-flags elif ! test_compiler; then if test_compiler "${nolib_flags[@]}"; then local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" diff --git a/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild b/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild index 8339d3420ba3..1962c02d2f22 100644 --- a/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild @@ -66,9 +66,9 @@ src_configure() { if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ + strip-unsupported-flags # ensure we can use clang before installing compiler-rt local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" - strip-unsupported-flags elif ! test_compiler; then if test_compiler "${nolib_flags[@]}"; then local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild index 5049bf3761b8..403e394f7446 100644 --- a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild @@ -67,9 +67,9 @@ src_configure() { if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ + strip-unsupported-flags # ensure we can use clang before installing compiler-rt local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" - strip-unsupported-flags elif ! test_compiler; then if test_compiler "${nolib_flags[@]}"; then local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild index af2de6ee54e0..f5ce47c037e8 100644 --- a/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild @@ -62,9 +62,9 @@ src_configure() { if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ + strip-unsupported-flags # ensure we can use clang before installing compiler-rt local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" - strip-unsupported-flags elif ! test_compiler; then if test_compiler "${nolib_flags[@]}"; then local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" -- 2.26.2