summaryrefslogtreecommitdiff
path: root/compat/vcbuild
diff options
context:
space:
mode:
authorLibravatar Dennis Ameling <dennis@dennisameling.com>2020-12-04 14:22:20 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-04 12:03:15 -0800
commite66590348a78d69b08dff8f6a1d978982e61465a (patch)
tree710734069078945eb6cec7f41ec267c6e73003e8 /compat/vcbuild
parentGit 2.29.2 (diff)
downloadtgif-e66590348a78d69b08dff8f6a1d978982e61465a.tar.xz
ci(vs-build): stop passing the iconv library location explicitly
Something changed in `vcpkg` (which we use in our Visual C++ build to provide the dependencies such as libcurl) and our `vs-build` job started failing in CI. The reason is that we had a work-around in place to help CMake find iconv, and this work-around is neither needed nor does it work anymore. For the full discussion with the vcpkg project, see this comment: https://github.com/microsoft/vcpkg/issues/14780#issuecomment-735368280 Signed-off-by: Dennis Ameling <dennis@dennisameling.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/vcbuild')
-rwxr-xr-xcompat/vcbuild/scripts/clink.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index df167d1e1a..3bd824154b 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -45,7 +45,7 @@ while (@ARGV) {
push(@args, "zlib.lib");
}
} elsif ("$arg" eq "-liconv") {
- push(@args, "libiconv.lib");
+ push(@args, "iconv.lib");
} elsif ("$arg" eq "-lcrypto") {
push(@args, "libcrypto.lib");
} elsif ("$arg" eq "-lssl") {