git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-31 12:28:51 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

clink.pl: fix libexpatd.lib link error when using MSVC

Browse Source 
When building with `make MSVC=1 DEBUG=1`, link to `libexpatd.lib`
rather than `libexpat.lib`.

It appears that the `vcpkg` package for "libexpat" has changed and now
creates `libexpatd.lib` for debug mode builds.  Previously, both debug
and release builds created a ".lib" with the same basename.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This commit is contained in:
Jeff Hostetler
2021-03-30 14:25:31 -04:00
committed by Johannes Schindelin
parent 857c0899cb
commit 5cc86b2fec
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compat/vcbuild/scripts/clink.pl
View File

@@ -66,7 +66,11 @@ while (@ARGV) {
} }
push(@args, $lib); push(@args, $lib);
} elsif ("$arg" eq "-lexpat") { } elsif ("$arg" eq "-lexpat") {
if ($is_debug) {
push(@args, "libexpatd.lib");
} else {
push(@args, "libexpat.lib"); push(@args, "libexpat.lib");
}
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") { } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
$arg =~ s/^-L/-LIBPATH:/; $arg =~ s/^-L/-LIBPATH:/;
push(@lflags, $arg); push(@lflags, $arg);