diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-06-04 21:09:56 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-06-04 15:52:21 -0700 |
| commit | bb0e43d8a1ae8489071573c5323c28ed2935a354 (patch) | |
| tree | 1162c924c1dc136f3bbaa173c4a66ffd0a57a476 /compat/vcbuild/scripts | |
| parent | Makefile: avoid running curl-config unnecessarily (diff) | |
| download | tgif-bb0e43d8a1ae8489071573c5323c28ed2935a354.tar.xz | |
msvc: fix "REG_STARTEND" issue
In 897d68e7af82 (Makefile: use curl-config --cflags, 2020-03-26), we
taught the build process to use `curl-config --cflags` to make sure that
it can find cURL's headers.
In the MSVC build, this is completely bogus because we're running in a
Git for Windows SDK whose `curl-config` supports the _GCC_ build.
Let's just ignore each and every `-I<path>` option where `<path>` points
to GCC/Clang specific headers.
Reported by Jeff Hostetler in
https://github.com/microsoft/git/issues/275.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/vcbuild/scripts')
| -rwxr-xr-x | compat/vcbuild/scripts/clink.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl index d9f71b7cbb..61ad084a7b 100755 --- 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; |