From 59bcd2675b4d9d9def0f3ce528f98c2f096c4bfc Mon Sep 17 00:00:00 2001 From: "H.Merijn Brand" Date: Fri, 25 Jun 2004 15:27:21 +0000 Subject: [PATCH] [perl #30450] perl 5.8.4: enhancement to hints/solaris_2.sh From: Nicholas Gianniotis (via RT) Date: 25 Jun 2004 09:39:51 -0000 Message-ID: and From: Andy Dougherty Date: Fri, 25 Jun 2004 11:30:11 -0400 (EDT) Message-ID: p4raw-id: //depot/perl@22996 --- hints/solaris_2.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 <&2 -- 2.7.4