Skip to content
Permalink
Browse files
Merge pull request #2819 from dscho/backport/os/vcbuild
 Backport `os/vcbuild` to fix CI failures
  • Loading branch information
dscho committed Sep 17, 2020
2 parents 5300e52 + 2cfaf3f commit f01810bfededd5903d58b9cdc2f36908d66d126c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
@@ -26,8 +26,8 @@ The Steps to Build Git with VS2015 or VS2017 from the command line.
Use ONE of the following forms which should match how you want to
compile git.exe.

$ ./compat/vcbuild/vcpkg_copy_packages.bat debug
$ ./compat/vcbuild/vcpkg_copy_packages.bat release
$ ./compat/vcbuild/vcpkg_copy_dlls.bat debug
$ ./compat/vcbuild/vcpkg_copy_dlls.bat release

3. Build git using MSVC from an SDK bash window using one of the
following commands:
@@ -67,7 +67,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);
@@ -80,6 +80,7 @@ sub createProject {
$libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
$libs_debug = $libs_release;
$libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
$libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;
$libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;
}

@@ -349,7 +349,7 @@ sub handleLinkLine
} elsif ("$part" eq "-lcurl") {
push(@libs, "libcurl.lib");
} elsif ("$part" eq "-lexpat") {
push(@libs, "expat.lib");
push(@libs, "libexpat.lib");
} elsif ("$part" eq "-liconv") {
push(@libs, "libiconv.lib");
} elsif ($part =~ /^[-\/]/) {

0 comments on commit f01810b

Please sign in to comment.