From: Richard Levitte <levitte@openssl.org>
Date: Sat, 17 Aug 2002 13:46:42 +0000 (+0000)
Subject: So, I discovered that if you have your $PATH set so a ld different from
X-Git-Tag: OpenSSL_0_9_7-beta4~168^2~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f309c1ae50a58f9f4521506b0325de415fb773e0;p=oweals%2Fopenssl.git

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...
---

diff --git a/Makefile.org b/Makefile.org
index d87dfa3f79..9611461751 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -275,9 +275,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