Re: [PATCH] vcbuild: fix library name for expat with make MSVC=1
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 3, 2020, 01:42 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2009030341540.56@tvgsbejvaqbjf.bet>
- In-Reply-To
- <pull.722.git.1599077798953.gitgitgadget@gmail.com>
Hi Orgad,
On Wed, 2 Sep 2020, Orgad Shaneh via GitGitGadget wrote:
Show 7 quoted lines
> From: Orgad Shaneh <orgads@gmail.com> > > Signed-off-by: Orgad Shaneh <orgads@gmail.com> > --- > vcbuild: fix library name for expat with make MSVC=1 > > Signed-off-by: Orgad Shaneh orgads@gmail.com [orgads@gmail.com]
As can be seen at https://dev.azure.com/git/git/_build/results?buildId=2065&view=artifacts&type=publishedArtifacts, this change is correct.
ACK.
Thank you, Dscho
Show 26 quoted lines
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-722%2Forgads%2Fvcbuild-expat-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-722/orgads/vcbuild-expat-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/722
>
> compat/vcbuild/scripts/clink.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
> index 61ad084a7b..df167d1e1a 100755
> --- a/compat/vcbuild/scripts/clink.pl
> +++ b/compat/vcbuild/scripts/clink.pl
> @@ -66,7 +66,7 @@
> }
> push(@args, $lib);
> } elsif ("$arg" eq "-lexpat") {
> - push(@args, "expat.lib");
> + push(@args, "libexpat.lib");
> } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
> $arg =~ s/^-L/-LIBPATH:/;
> push(@lflags, $arg);
>
> base-commit: e19713638985533ce461db072b49112da5bd2042
> --
> gitgitgadget
>