Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / compat / vcbuild / scripts / clink.pl

diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index d9f71b7cbb71676567930f327c1c0acf0b67641a..df167d1e1a542d37c794f0ed307dfdaac89092e3 100755 (executable)
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -23,7 +23,9 @@ while (@ARGV) {
            # before any "-l*" flags.
            $is_debug = 1;
        }
-       if ("$arg" =~ /^-[DIMGOZ]/) {
+       if ("$arg" =~ /^-I\/mingw(32|64)/) {
+               # eat
+       } elsif ("$arg" =~ /^-[DIMGOZ]/) {
                push(@cflags, $arg);
        } elsif ("$arg" eq "-o") {
                my $file_out = shift @ARGV;
@@ -64,7 +66,7 @@ while (@ARGV) {
                }
                push(@args, $lib);
        } elsif ("$arg" eq "-lexpat") {
-               push(@args, "expat.lib");
+               push(@args, "libexpat.lib");
        } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
                $arg =~ s/^-L/-LIBPATH:/;
                push(@lflags, $arg);