summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure18
1 files changed, 16 insertions, 2 deletions
diff --git a/Configure b/Configure
index 9cd7fe661a..847a90a54d 100755
--- a/Configure
+++ b/Configure
@@ -25,7 +25,7 @@
# $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $
#
-# Generated on Wed Apr 2 20:45:31 CEST 2008 [metaconfig 3.5 PL0]
+# Generated on Sat May 17 15:55:21 CEST 2008 [metaconfig 3.5 PL0]
# (with additional metaconfig patches by perlbug@perl.org)
cat >c1$$ <<EOF
@@ -5119,7 +5119,7 @@ default|recommended)
# as that way the compiler can do the right implementation dependant
# thing. (NWC)
case "$gccversion" in
- ?*) set stack-protector -fstack-protector 'ldflags="$ldflags -fstack-protector"'
+ ?*) set stack-protector -fstack-protector
eval $checkccflag
;;
esac
@@ -5258,6 +5258,10 @@ case "$ldflags" in
case "$ccflags" in
*-posix*) dflt="$dflt -posix" ;;
esac
+ # See note above about -fstack-protector
+ case "$ccflags" in
+ *-fstack-protector*) dflt="$dflt -fstack-protector" ;;
+ esac
;;
*) dflt="$ldflags";;
esac
@@ -8023,6 +8027,16 @@ EOM
''|' ') dflt='none' ;;
esac
+ case "$ldflags" in
+ *-fstack-protector*)
+ case "$dflt" in
+ *-fstack-protector*) ;; # Don't add it again
+ *) dflt="$dflt -fstack-protector" ;;
+ esac
+ ;;
+ esac
+
+
rp="Any special flags to pass to $ld to create a dynamically loaded library?"
. ./myread
case "$ans" in