summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Dougherty <doughera@lafayette.edu>2004-05-11 09:14:42 -0400
committerH.Merijn Brand <h.m.brand@xs4all.nl>2004-05-12 10:43:42 +0000
commit00e89ad4bdb96e09c9ac232f26acc05942ca5f74 (patch)
tree6b08fb615b5930b7b4b8573528072f7f3e922f66
parent59f20ca5be6f62ae0afd1d5e20092f7cf757efc3 (diff)
downloadperl-00e89ad4bdb96e09c9ac232f26acc05942ca5f74.tar.gz
Configure shouldn't unconditionally add in -pipe
Message-ID: <Pine.SOL.4.58.0405111313210.14279@maxwell.phys.lafayette.edu> p4raw-id: //depot/perl@22815
-rwxr-xr-xConfigure32
-rw-r--r--hints/darwin.sh3
-rw-r--r--hints/rhapsody.sh3
3 files changed, 28 insertions, 10 deletions
diff --git a/Configure b/Configure
index 8cf562f66b..5087714182 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
#
-# Generated on Thu May 6 13:54:05 METDST 2004 [metaconfig 3.0 PL70]
+# Generated on Wed May 12 13:00:30 METDST 2004 [metaconfig 3.0 PL70]
# (with additional metaconfig patches by perlbug@perl.org)
cat >c1$$ <<EOF
@@ -3891,7 +3891,6 @@ case "$gccversion" in
*) gccshortvers=`echo "$gccversion"|sed 's/ .*//'`
gccosandvers=`$cc -v 2>&1|grep '/specs$'|sed "s!.*/[^-/]*-[^-/]*-\([^-/]*\)/$gccshortvers/specs!\1!"`
gccshortvers=''
- ccflags="$ccflags -pipe"
case "$gccosandvers" in
$osname) gccosandvers='' ;; # linux gccs seem to have no linux osvers, grr
$osname$osvers) ;; # looking good
@@ -4709,6 +4708,7 @@ default|recommended)
2*) if test -d /etc/conf/kconfig.d &&
$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
then
+ # Interactive Systems (ISC) POSIX mode.
dflt="$dflt -posix"
fi
;;
@@ -4722,7 +4722,7 @@ default|recommended)
if $cc -O2 -fno-strict-aliasing -o gcctest gcctest.c; then
echo "Yes, it does." 2>&1
case "$ccflags" in
- *strict-aliasing*)
+ *strict-aliasing*)
echo "Leaving current flags $ccflags alone." 2>&1
;;
*) dflt="$dflt -fno-strict-aliasing" ;;
@@ -4732,6 +4732,26 @@ default|recommended)
fi
;;
esac
+ # For gcc, adding -pipe speeds up compilations for some, but apparently
+ # some assemblers can't read from stdin. (It also slows down compilations
+ # in other cases, but those are apparently rarer these days.) AD 5/2004.
+ case "$gccversion" in
+ ?*) echo " "
+ echo "Checking if your compiler accepts -pipe" 2>&1
+ echo 'int main(void) { return 0; }' > gcctest.c
+ if $cc -O2 -pipe -o gcctest gcctest.c; then
+ echo "Yes, it does." 2>&1
+ case "$ccflags" in
+ *-pipe*)
+ echo "Leaving current flags $ccflags alone." 2>&1
+ ;;
+ *) dflt="$dflt -pipe" ;;
+ esac
+ else
+ echo "Nope, it doesn't, but that's ok." 2>&1
+ fi
+ ;;
+ esac
;;
esac
@@ -4743,8 +4763,8 @@ for thisincl in $inclwanted; do
if $test -d $thisincl; then
if $test x$thisincl != x$usrinc; then
case "$dflt" in
- *" -I$thisincl "*);;
- *) dflt="$dflt -I$thisincl ";;
+ *" -I$thisincl "*);;
+ *) dflt="$dflt -I$thisincl ";;
esac
fi
fi
@@ -4875,7 +4895,7 @@ esac
for thislibdir in $libpth; do
case " $loclibpth " in
*" $thislibdir "*)
- case "$dflt " in
+ case "$dflt " in
*"-L$thislibdir "*) ;;
*) dflt="$dflt -L$thislibdir" ;;
esac
diff --git a/hints/darwin.sh b/hints/darwin.sh
index e117a26366..9223abd7e6 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -89,12 +89,11 @@ fi
;;
esac
-# -pipe: makes compilation go faster.
# -fno-common because common symbols are not allowed in MH_DYLIB
# -DPERL_DARWIN: apparently the __APPLE__ is not sanctioned by Apple
# as the way to differentiate Mac OS X. (The official line is that
# *no* cpp symbol does differentiate Mac OS X.)
-ccflags="${ccflags} -pipe -fno-common -DPERL_DARWIN"
+ccflags="${ccflags} -fno-common -DPERL_DARWIN"
# At least on Darwin 1.3.x:
#
diff --git a/hints/rhapsody.sh b/hints/rhapsody.sh
index ed32402c62..6151e7858d 100644
--- a/hints/rhapsody.sh
+++ b/hints/rhapsody.sh
@@ -53,9 +53,8 @@ libc='/System/Library/Frameworks/System.framework/System';
# Optimize.
optimize='-O3';
-# -pipe: makes compilation go faster.
# -fno-common because common symbols are not allowed in MH_DYLIB
-ccflags="${ccflags} -pipe -fno-common"
+ccflags="${ccflags} -fno-common"
# Unverified whether this is necessary on Rhapsody, but the test shouldn't hurt.
# At least on Darwin 1.3.x: