- fixed branch.diff, bug-111413.patch already in branch.diff

[packages/gcc.git] / gcc-optimize-la.pl

diff --git a/gcc-optimize-la.pl b/gcc-optimize-la.pl
index 56245293f22177a2bc683148b0201e914b9fb88e..39c4eac8ec560d40b2e25ec956796246608b2fa6 100644 (file)
--- a/gcc-optimize-la.pl
+++ b/gcc-optimize-la.pl
@@ -16,11 +16,13 @@ close(F);
 
 foreach (@lines)
 {
-    if (/(^dependency_libs='(.*)')/)
+    if (/(^dependency_libs='(.*)')[\ \t]*$/)
     {
-       @libs = split(/[\ \t\n]+/, trim($2));
-       @L = grep(/^-L.*gcc\/.*\/\d\.\d\.\d(\/32)*$/, @libs);
-       @l = grep(/^-l.*/, @libs);
+       my $trimmed = trim($2);
+       $trimmed =~ y/'//d;
+       @libs = split(/[\ \t\n]+/, $trimmed);
+       @L = grep(/^-L.*gcc\/.*\/\d\.\d\.\d(\/(32|64|x32|nof))*$/, @libs);
+       @l = grep(/^(-l.*|\/.*\.la$)/, @libs);
        $opt_L = join(' ', @L);
        $opt_l = join(' ', @l);
        print("dependency_libs='");