diff options
| author | Nicholas Clark <nick@ccl4.org> | 2004-06-29 11:09:36 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2004-06-29 11:09:36 +0000 |
| commit | 82a1f4a9acda851b876386fb0a3b052923739c99 (patch) | |
| tree | da774f56f0be7560286fd00c7552709e0311f905 | |
| parent | b79595e683c4bcd685decd996c86e1c4de40c128 (diff) | |
| download | perl-82a1f4a9acda851b876386fb0a3b052923739c99.tar.gz | |
Integrate:
[ 22996]
Subject: [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>
[ 23007]
HP-UX 10.20 still *needs* -Ae for HP C-ANSI-C to be ANSI
11.00 and on are ANSI by default for /opt/ansic/bin
Error was introduced by #22975 in re-enabling 10.01
p4raw-link: @23007 on //depot/perl: 17ad866aff02c2981c62916ae8d9737d2b10d9fd
p4raw-link: @22996 on //depot/perl: 59bcd2675b4d9d9def0f3ce528f98c2f096c4bfc
p4raw-id: //depot/maint-5.8/perl@23009
p4raw-integrated: from //depot/perl@23005 'copy in' hints/solaris_2.sh
(@22585..) hints/hpux.sh (@22975..)
| -rw-r--r-- | hints/hpux.sh | 2 | ||||
| -rw-r--r-- | hints/solaris_2.sh | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/hints/hpux.sh b/hints/hpux.sh index 335b3dd461..8fe709284f 100644 --- a/hints/hpux.sh +++ b/hints/hpux.sh @@ -142,7 +142,7 @@ case `$cc -v 2>&1`"" in *) ccflags="-Ae $cc_cppflags" # +vnocompatwarnings not known in 10.10 and older if [ $xxOsRev -ge 1020 ]; then - ccflags="$cc_cppflags -Wl,+vnocompatwarnings" + ccflags="$ccflags -Wl,+vnocompatwarnings" fi ;; esac diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh index c41d31620f..ce36480b18 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 |