Re: [PATCH] vcbuild: fix library name for expat with make MSVC=1

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sep 3, 2020, 00:06 UTC
Message-ID: <20200903000640.GD4035286@google.com>
In-Reply-To: <pull.722.git.1599077798953.gitgitgadget@gmail.com>

(cc-ing a couple of Windows experts) Orgad Shaneh wrote:

> Subject: vcbuild: fix library name for expat with make MSVC=1

Do you have more details? For example, what error message does the build produce without this change?

Show 8 quoted lines

> Signed-off-by: Orgad Shaneh <orgads@gmail.com>
> ---
> 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(-)

I'm ignorant enough about the platform-specific details involved that I'd like an Ack from one of the Windows folks.

Thanks, Jonathan

Show 17 quoted lines

> 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