[patch] sandbox-2.16-LIBC_PATH-gold.patch

sandbox-2.16-LIBC_PATH-gold.patch (text/plain), 1.79 KB, created by Sergei Trofimovich (RETIRED) on 2019-03-13 07:31:08 UTC

https://bugs.gentoo.org/680034

--- a/configure
+++ b/configure
@@ -14997,8 +14997,8 @@ try_link() {
 		exit ${ret}
 	) 1>&5
 }
-LIBC_PATH=$(if 			try_link -Wl,--verbose && grep -q attempt libctest.log; then :
-  $AWK '/ttempt to open/ { if (($(NF-1) ~ /\/libc\.so/) && ($NF == "succeeded")) LIBC = $(NF-1); }; END {print LIBC}' libctest.log
+LIBC_PATH=$(if 				try_link -Wl,--verbose && grep -q '[Aa]ttempt' libctest.log; then :
+  $AWK '/[Aa]ttempt to open/ { if (($(NF-1) ~ /\/libc\.so/) && ($NF == "succeeded")) LIBC = $(NF-1); }; END {print LIBC}' libctest.log
 elif 			try_link -Wl,--verbose; then :
   $EGREP -o '/[^ ]*/libc.so.*' libctest.log | tail -n1
 elif 	try_link -Wl,-m; then :
--- a/configure.ac
+++ b/configure.ac
@@ -345,10 +345,11 @@ try_link() {
 }
 LIBC_PATH=$(AS_IF(
 	dnl GNU linker (bfd & gold) searching for
-	dnl     "attempt to open /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/../../../../lib64/libc.so succeeded"
+	dnl (bfd)  "attempt to open /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/../../../../lib64/libc.so succeeded"
+	dnl (gold) "/usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: Attempt to open /lib64/libc.so.6 succeeded"
 	dnl if log does not contain "attempt" word then it's not a GNU linker
-	[try_link -Wl,--verbose && grep -q attempt libctest.log],
-		[$AWK '/ttempt to open/ { if (($(NF-1) ~ /\/libc\.so/) && ($NF == "succeeded")) LIBC = $(NF-1); }; END {print LIBC}' libctest.log],
+	[try_link -Wl,--verbose && grep -q '[[Aa]]ttempt' libctest.log],
+		[$AWK '/[[Aa]]ttempt to open/ { if (($(NF-1) ~ /\/libc\.so/) && ($NF == "succeeded")) LIBC = $(NF-1); }; END {print LIBC}' libctest.log],
 	dnl LLVM lld searching for latest (successful) entry of
 	dnl     "ld.lld: /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/../../../../lib64/libc.so"
 	dnl     "ld.lld: /lib64/libc.so.6"