Browse Source

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
maint
Junio C Hamano 5 years ago
parent
commit
9906d5f8e9
  1. 4
      compat/vcbuild/scripts/clink.pl

4
compat/vcbuild/scripts/clink.pl

@ -23,7 +23,9 @@ while (@ARGV) { @@ -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;

Loading…
Cancel
Save