X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fbuildsystems%2Fengine.pl;h=23da787dc5565193dd93fa7406cd86f39651bb52;hb=92de348948d59f797dd4f15d6a4558c0563203b1;hp=d506717bfd304a1aaf4a02ad262ee96a0e468771;hpb=a1bb8f45f1590f812badceea0b7c120074ec3e85;p=git.git

diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index d506717bf..23da787dc 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
 #
@@ -317,6 +319,7 @@ sub handleLinkLine
             push(@libs, "zlib.lib");
 	} elsif ("$part" eq "-lcrypto") {
             push(@libs, "libeay32.lib");
+        } elsif ("$part" eq "-lssl") {
             push(@libs, "ssleay32.lib");
         } elsif ($part =~ /^-/) {
             push(@lflags, $part);