vcbuild: fix library name for expat with make MSVC=1
PATCH 1/1 vcbuild: fix library name for expat with make MSVC=1
From: Orgad Shaneh <[email protected]>
---
vcbuild: fix library name for expat with make MSVC=1
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(-)
compat/vcbuild/scripts/clink.pl +1 -1
@@ -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
Signature · 1 line
gitgitgadget
(cc-ing a couple of Windows experts)
Quoted 1 line · Orgad Shaneh
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?
Quoted 8 lines
Signed-off-by Orgad Shaneh <[email protected]>---
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/722compat/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
Quoted 17 lines
compat/vcbuild/scripts/clink.pl +1
-1@@ -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:
e19713638985533ce461db072b49112da5bd2042Signature · 1 line
gitgitgadget
Quoted 7 lines · Jonathan Nieder
(cc-ing a couple of Windows experts)
Quoted 1 line · Orgad Shaneh
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?
Presumably you'd get an error at link time, saying either 'no such
library: expat.lib', or 'symbol X not found' for symbols that were supposed to come from libexpat.lib.
I do not think we want to see exact error message. If an empty body of the log message bothers us, I probably would say that it is sufficient to write something like
The name of the expat library is libexpat.lib, not expat.lib; otherwise we'd get linkage errors.
Quoted 2 lines
I'm ignorant enough about the platform-specific details involved that I'd like an Ack from one of the Windows folks.
I saw Dscho looked at both pull requests and commented on them, but haven't seen him (or anybody else) acking or nacking the version that was submitted. It would be nice to see an Ack from Windows' side.
Thanks.
Hi Orgad,
Quoted 7 lines · Orgad Shaneh via GitGitGadget
From: Orgad Shaneh <[email protected]>
Signed-off-by Orgad Shaneh <[email protected]>---
vcbuild: fix library name for expat with make MSVC=1Signed-off-by Orgad Shaneh [email protected] [[email protected]]
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
Quoted 26 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/722compat/vcbuild/scripts/clink.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)compat/vcbuild/scripts/clink.pl +1
-1@@ -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