summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-07-29 20:08:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-29 21:51:43 (GMT)
commit4553f9de23f8d451bf801b566247bf987570626a (patch)
tree2186b316e40cd6d347a2542462bd2ce4657044b7 /contrib
parent6e500217f99ee6c3a314cb15766aa5dce99f55ca (diff)
downloadgit-4553f9de23f8d451bf801b566247bf987570626a.zip
git-4553f9de23f8d451bf801b566247bf987570626a.tar.gz
git-4553f9de23f8d451bf801b566247bf987570626a.tar.bz2
contrib/buildsystems: handle options starting with a slash
With the recent changes to allow building with MSVC=1, we now pass the /OPT:REF option to the compiler. This confuses the parser that wants to turn the output of a dry run into project definitions for QMake and Visual Studio: Unhandled link option @ line 213: /OPT:REF at [...] Let's just extend the code that passes through options that start with a dash, so that it passes through options that start with a slash, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/buildsystems/engine.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 9bde7ae..8bb07e8 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -351,7 +351,7 @@ sub handleLinkLine
push(@libs, "expat.lib");
} elsif ("$part" eq "-liconv") {
push(@libs, "libiconv.lib");
- } elsif ($part =~ /^-/) {
+ } elsif ($part =~ /^[-\/]/) {
push(@lflags, $part);
} elsif ($part =~ /\.(a|lib)$/) {
$part =~ s/\.a$/.lib/;