From 9b0defd1bbc0144a8ab3d7c93c06bf927dc9493a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 17 Aug 2002 13:46:46 +0000 Subject: [PATCH] So, I discovered that if you have your $PATH set so a ld different from GNU ld comes first, checking the usage of collect2 gives that instead of GNU ld, even if GNU ld would be the one that would get used if we link using gcc. It's much better, apparently, to ask gcc directly what the path to GNU ld is (provided it's there at all and gcc knows about it), and ask the result if it's a GNU or not. The bonus is that our GNU ld detection mechanism got shorter and easier to understand... --- Makefile.org | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile.org b/Makefile.org index 6b5af10f7e..e4bc277d95 100644 --- a/Makefile.org +++ b/Makefile.org @@ -270,9 +270,7 @@ do_gnu-shared: done DETECT_GNU_LD=${CC} -v 2>&1 | grep '^gcc' >/dev/null 2>&1 && \ - collect2=`gcc -print-prog-name=collect2 2>&1` && \ - [ -n "$$collect2" ] && \ - my_ld=`$$collect2 --help 2>&1 | grep Usage: | sed 's/^Usage: *\([^ ][^ ]*\).*/\1/'` && \ + ld=`gcc -print-prog-name=ld 2>&1` && \ [ -n "$$my_ld" ] && \ $$my_ld -v 2>&1 | grep 'GNU ld' >/dev/null 2>&1 -- 2.25.1