Skip to content

Commit

Permalink
msvc: fix "REG_STARTEND" issue
Browse files Browse the repository at this point in the history
In 897d68e (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
microsoft#275.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Jun 4, 2020
1 parent 26f52f4 commit b0fa428
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion compat/vcbuild/scripts/clink.pl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
# 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;
Expand Down

0 comments on commit b0fa428

Please sign in to comment.