[svn:parrot] r48769 - trunk/config/inter

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Fri Sep  3 00:23:13 2010
New Revision: 48769
URL: https://trac.parrot.org/parrot/changeset/48769

Log:
Per discussion in http://trac.parrot.org/parrot/ticket/854, revert code
changes in r48758, deleting TODO item and replacing it with explanatory inline
comment.

Modified:
   trunk/config/inter/progs.pm

Modified: trunk/config/inter/progs.pm
==============================================================================
--- trunk/config/inter/progs.pm	Fri Sep  3 00:16:31 2010	(r48768)
+++ trunk/config/inter/progs.pm	Fri Sep  3 00:23:13 2010	(r48769)
@@ -103,11 +103,16 @@
     $conf->debug("\nccflags: $ccflags\n");
 
     $linkflags = $conf->data->get('linkflags');
+    # The substitution below has no effect on most platforms but may be needed
+    # on Win32 with Strawberry Perl and other OSes.  See TT #854.
+    $linkflags =~ s/-libpath:\S+//g;
     $linkflags = integrate( $linkflags, $conf->options->get('linkflags') );
     $linkflags = prompt( "And flags for your linker?", $linkflags ) if $ask;
     $conf->data->set( linkflags => $linkflags );
 
     $ldflags = $conf->data->get('ldflags');
+    # For substitution below, see comment above.
+    $ldflags =~ s/-libpath:\S+//g;
     $ldflags = integrate( $ldflags, $conf->options->get('ldflags') );
     $ldflags = prompt( "And your $ld flags for building shared libraries?", $ldflags )
         if $ask;