mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci(vs-build): stop passing the iconv library location explicitly

Browse Source 
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>
This commit is contained in:
Dennis Ameling
2020-12-04 14:22:20 +00:00
committed by Junio C Hamano
parent 898f80736c
commit e66590348a
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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") {