engine.pl: Fix a recent breakage of the buildsystem generator
Commit ade2ca0c (Do not try to remove directories when removing old links, 2009-10-27) added an expression to a 'test' using an '-o' or connective. This resulted in the buildsystem generator mistaking a conditional 'rm' for a linker command. In order to fix the breakage, we filter out all 'test' commands before then attempting to identify the commands of interest. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones committed
Jan 22, 2010 at 20:00 UTC
74cf9bdda693e4c7b9443dea6a30d52f55f16517
1 file changed
+5
-3
contrib/buildsystems/engine.pl
+5
-3
@@ -135,6 +135,11 @@ sub parseMakeOutput
135
}
136
} while($ate_next);
137
138
+ if ($text =~ /^test /) {
139
+ # options to test (eg -o) may be mistaken for linker options
140
+ next;
141
+ }
142
+
143
if($text =~ / -c /) {
144
# compilation
145
handleCompileLine($text, $line);
@@ -180,9 +185,6 @@ sub parseMakeOutput
185
# } elsif ($text =~ /generate-cmdlist\.sh/) {
186
# # command for generating list of commands
187
#
183
-# } elsif ($text =~ /^test / && $text =~ /|| rm -f /) {
184
-# # commands removing executables, if they exist
185
-#
188
# } elsif ($text =~ /new locations or Tcl/) {
189
# # command for detecting Tcl/Tk changes
190
#