diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-14 18:21:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-14 18:21:38 (GMT) |
| commit | ccbde2c4f4751096a526527e1aab3e508f093a3f (patch) | |
| tree | 96d05d3fb2e0725e396c1ea564b3b7b39f89cc9e /compat | |
| parent | 3c9f0df16a20071aa6810152dd7f4003f3d96c4b (diff) | |
| parent | e66590348a78d69b08dff8f6a1d978982e61465a (diff) | |
| download | git-ccbde2c4f4751096a526527e1aab3e508f093a3f.zip git-ccbde2c4f4751096a526527e1aab3e508f093a3f.tar.gz git-ccbde2c4f4751096a526527e1aab3e508f093a3f.tar.bz2 | |
Merge branch 'da/vs-build-iconv-fix'
Build update.
* da/vs-build-iconv-fix:
ci(vs-build): stop passing the iconv library location explicitly
Diffstat (limited to 'compat')
| -rwxr-xr-x | compat/vcbuild/scripts/clink.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl index df167d1..3bd8241 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") { |