Change 33843 by [EMAIL PROTECTED] on 2008/05/17 13:56:26

        Subject: [perl #54120] [PATCH] [metaconfig] Need more -fstack-protector 
        From: Andy Dougherty (via RT) <[EMAIL PROTECTED]>
        Date: Tue, 13 May 2008 09:37:07 -0700
        Message-ID: <[EMAIL PROTECTED]>

Affected files ...

... //depot/perl/Configure#690 edit

Differences ...

==== //depot/perl/Configure#690 (xtext) ====
Index: perl/Configure
--- perl/Configure#689~33631~   2008-04-02 11:46:13.000000000 -0700
+++ perl/Configure      2008-05-17 06:56:26.000000000 -0700
@@ -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 [EMAIL PROTECTED])
 
 cat >c1$$ <<EOF
@@ -5119,7 +5119,7 @@
        # 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 "$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 @@
        ''|' ') 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
End of Patch.

Reply via email to