diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-14 21:21:38 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-14 21:21:38 +0300 |
| commit | ccbde2c4f4751096a526527e1aab3e508f093a3f (patch) | |
| tree | 96d05d3fb2e0725e396c1ea564b3b7b39f89cc9e /contrib | |
| parent | 3c9f0df16a20071aa6810152dd7f4003f3d96c4b (diff) | |
| parent | e66590348a78d69b08dff8f6a1d978982e61465a (diff) | |
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 'contrib')
| -rwxr-xr-x | contrib/buildsystems/engine.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 2ff9620459..ed6c45988a 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -351,7 +351,7 @@ sub handleLinkLine } elsif ("$part" eq "-lexpat") { push(@libs, "libexpat.lib"); } elsif ("$part" eq "-liconv") { - push(@libs, "libiconv.lib"); + push(@libs, "iconv.lib"); } elsif ($part =~ /^[-\/]/) { push(@lflags, $part); } elsif ($part =~ /\.(a|lib)$/) { |