[svn:parrot] r42799 - trunk/runtime/parrot/library

[fperrad at svn.parrot.org]

Author: fperrad
Date: Tue Nov 24 17:15:40 2009
New Revision: 42799
URL: https://trac.parrot.org/parrot/changeset/42799

Log:
[distutils] _has_strip checks custom cflags

Modified:
   trunk/runtime/parrot/library/distutils.pir

Modified: trunk/runtime/parrot/library/distutils.pir
==============================================================================
--- trunk/runtime/parrot/library/distutils.pir	Tue Nov 24 16:57:25 2009	(r42798)
+++ trunk/runtime/parrot/library/distutils.pir	Tue Nov 24 17:15:40 2009	(r42799)
@@ -610,7 +610,7 @@
     .local string exe
     exe = get_exe()
     .local int has_strip
-    has_strip = _has_strip()
+    has_strip = _has_strip('')
     $P0 = iter hash
   L1:
     unless $P0 goto L2
@@ -640,10 +640,13 @@
 .end
 
 .sub '_has_strip' :anon
+    .param string cflags
     .local pmc config
     config = get_config()
     $S0 = config['gccversion']
     unless $S0 goto L1
+    $I0 = index cflags, '-g '
+    unless $I0 < 0 goto L1
     $S0 = config['cflags']
     $I0 = index $S0, '-g '
     unless $I0 < 0 goto L1
@@ -770,7 +773,7 @@
     cmd .= ldflags
     system(cmd)
 
-    $I0 = _has_strip()
+    $I0 = _has_strip(cflags)
     unless $I0 goto L2
     cmd = "strip " . dynext
     system(cmd)
@@ -1040,7 +1043,7 @@
     cmd .= ldflags
     system(cmd)
 
-    $I0 = _has_strip()
+    $I0 = _has_strip(cflags)
     unless $I0 goto L6
     cmd = "strip " . dynext
     system(cmd)
@@ -2141,7 +2144,7 @@
   L10:
 
     .local string vcs
-    vcs = 'vcs'
+    vcs = 'VCS'
     $I0 = file_exists('CVS')
     unless $I0 goto L21
     vcs = 'cvs'
@@ -2158,7 +2161,7 @@
     goto L29
   L23:
     $I0 = file_exists('.svn')
-    unless $I0 goto L4
+    unless $I0 goto L24
     vcs = 'svn'
     goto L29
   L24: