diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-06-17 21:54:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-17 21:54:03 -0700 |
| commit | 9906d5f8e9323724f74715740161e4a91f5d7f87 (patch) | |
| tree | e6831afcc5a0f9195aa92d53c45fd59b2a7242c3 /compat | |
| parent | Merge branch 'en/sparse-checkout' (diff) | |
| parent | msvc: fix "REG_STARTEND" issue (diff) | |
| download | tgif-9906d5f8e9323724f74715740161e4a91f5d7f87.tar.xz | |
Merge branch 'js/msvc-build-fix'
Workaround breakage in MSVC build, where "curl-config --cflags"
gives settings appropriate for GCC build.
* js/msvc-build-fix:
msvc: fix "REG_STARTEND" issue
Diffstat (limited to 'compat')
| -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; |