Skip to content

Commit 53cae2c

Browse files
dschoGit for Windows Build Agent
authored andcommitted
msvc: fix "REG_STARTEND" issue
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 <[email protected]>
1 parent 2f35cd2 commit 53cae2c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

compat/vcbuild/scripts/clink.pl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
# before any "-l*" flags.
2424
$is_debug = 1;
2525
}
26-
if ("$arg" =~ /^-[DIMGOZ]/) {
26+
if ("$arg" =~ /^-I\/mingw(32|64)/) {
27+
# eat
28+
} elsif ("$arg" =~ /^-[DIMGOZ]/) {
2729
push(@cflags, $arg);
2830
} elsif ("$arg" eq "-o") {
2931
my $file_out = shift @ARGV;

0 commit comments

Comments
 (0)