diff options
| author |  Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2010-01-22 20:00:47 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-22 15:55:49 -0800 |
| commit | 74cf9bdda693e4c7b9443dea6a30d52f55f16517 (patch) | |
| tree | 3a11db1dd09fa32af9d6dbd88dfa55b01bd4d6a5 /contrib | |
| parent | git-mv: fix moving more than one source to a single destination (diff) | |
| download | tgif-74cf9bdda693e4c7b9443dea6a30d52f55f16517.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/buildsystems/engine.pl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index d506717bfd..8f890fb5a5 100644 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -135,6 +135,11 @@ sub parseMakeOutput } } while($ate_next); + if ($text =~ /^test /) { + # options to test (eg -o) may be mistaken for linker options + next; + } + if($text =~ / -c /) { # compilation handleCompileLine($text, $line); @@ -180,9 +185,6 @@ sub parseMakeOutput # } elsif ($text =~ /generate-cmdlist\.sh/) { # # command for generating list of commands # -# } elsif ($text =~ /^test / && $text =~ /|| rm -f /) { -# # commands removing executables, if they exist -# # } elsif ($text =~ /new locations or Tcl/) { # # command for detecting Tcl/Tk changes # |