From 28e3d252dc8ac8a5635206dfefe1cfe05058d1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Aug 2018 06:32:46 +0100 Subject: gentoo resync : 12.08.2018 --- sys-libs/libcxx/libcxx-6.0.9999.ebuild | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'sys-libs/libcxx/libcxx-6.0.9999.ebuild') diff --git a/sys-libs/libcxx/libcxx-6.0.9999.ebuild b/sys-libs/libcxx/libcxx-6.0.9999.ebuild index 7454f776ff64..8b1b4efcd6e8 100644 --- a/sys-libs/libcxx/libcxx-6.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-6.0.9999.ebuild @@ -113,16 +113,12 @@ multilib_src_configure() { # if we're using libunwind and clang with compiler-rt, we want # to link to compiler-rt instead of -lgcc_s if tc-is-clang; then - # get the full library list out of 'pretend mode' - # and grep it for libclang_rt references - local args=( $($(tc-getCC) -### -x c - 2>&1 | tail -n 1) ) - local i - for i in "${args[@]}"; do - if [[ ${i} == *libclang_rt* ]]; then - want_gcc_s=OFF - extra_libs+=( "${i}" ) - fi - done + local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ + ${LDFLAGS} -print-libgcc-file-name) + if [[ ${compiler_rt} == *libclang_rt* ]]; then + want_gcc_s=OFF + extra_libs+=( "${compiler_rt}" ) + fi fi fi -- cgit v1.2.3