From: H.Merijn Brand <h.m.brand@xs4all.nl>
Date: Fri, 25 Jun 2004 15:27:21 +0000 (+0000)
Subject: [perl #30450] perl 5.8.4: enhancement to hints/solaris_2.sh
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=59bcd2675b4d9d9def0f3ce528f98c2f096c4bfc;p=p5sagit%2Fp5-mst-13.2.git

[perl #30450] perl 5.8.4: enhancement to hints/solaris_2.sh
From: Nicholas Gianniotis (via RT) <perlbug-followup@perl.org>
Date: 25 Jun 2004 09:39:51 -0000
Message-ID: <rt-3.0.9-30450-91340.10.3279898804255@perl.org>
  and
From: Andy Dougherty <doughera@lafayette.edu>
Date: Fri, 25 Jun 2004 11:30:11 -0400 (EDT)
Message-ID: <Pine.SOL.4.58.0406251113420.15961@maxwell.phys.lafayette.edu>

p4raw-id: //depot/perl@22996
---

diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index c41d316..ce36480 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -243,9 +243,13 @@ END
 	    # Hmm.  gcc doesn't call /usr/ccs/bin/ld directly, but it
 	    # does appear to be using it eventually.  egcs-1.0.3's ld
 	    # wrapper does this.
-	    # All Solaris versions of ld I've seen contain the magic
+	    # Most Solaris versions of ld I've seen contain the magic
 	    # string used in the grep.
 	    :
+	elif echo "$verbose" | grep "Solaris Link Editors" >/dev/null 2>&1; then
+	    # However some Solaris 8 versions prior to ld 5.8-1.286 contain
+	    # this string instead.
+	    :
 	else
 	    # No evidence yet of /usr/ccs/bin/ld.  Some versions
 	    # of egcs's ld wrapper call /usr/ccs/bin/ld in turn but
@@ -265,6 +269,10 @@ END
 		grep "ld: Software Generation Utilities" >/dev/null 2>&1; then
 		# Ok, /usr/ccs/bin/ld eventually does get called.
 		:
+	    elif ${myld:-ld} -V 2>&1 |
+		grep "Solaris Link Editors" >/dev/null 2>&1; then
+		# Ok, /usr/ccs/bin/ld eventually does get called.
+		:
 	    else
 		echo "Found GNU ld='$myld'" >&4
 		cat <<END >&2