diff options
Diffstat (limited to 'third_party/git/compat/vcbuild')
| -rw-r--r-- | third_party/git/compat/vcbuild/find_vs_env.bat | 2 | ||||
| -rwxr-xr-x | third_party/git/compat/vcbuild/scripts/clink.pl | 52 |
2 files changed, 4 insertions, 50 deletions
diff --git a/third_party/git/compat/vcbuild/find_vs_env.bat b/third_party/git/compat/vcbuild/find_vs_env.bat index b35d264c0e..40194dd230 100644 --- a/third_party/git/compat/vcbuild/find_vs_env.bat +++ b/third_party/git/compat/vcbuild/find_vs_env.bat @@ -18,7 +18,7 @@ REM and MAKE, we must blend these two different worlds. This script REM attempts to do that. REM ================================================================ REM This BAT file starts in a plain (non-developer) command prompt, -REM searches for the "best" command prompt setup script, installs +REM searches for the "best" commmand prompt setup script, installs REM it into the current CMD process, and exports the various MSVC REM environment variables for use by MAKE. REM diff --git a/third_party/git/compat/vcbuild/scripts/clink.pl b/third_party/git/compat/vcbuild/scripts/clink.pl index d9f71b7cbb..c7b021bfac 100755 --- a/third_party/git/compat/vcbuild/scripts/clink.pl +++ b/third_party/git/compat/vcbuild/scripts/clink.pl @@ -45,9 +45,9 @@ while (@ARGV) { } elsif ("$arg" eq "-liconv") { push(@args, "libiconv.lib"); } elsif ("$arg" eq "-lcrypto") { - push(@args, "libcrypto.lib"); + push(@args, "libeay32.lib"); } elsif ("$arg" eq "-lssl") { - push(@args, "libssl.lib"); + push(@args, "ssleay32.lib"); } elsif ("$arg" eq "-lcurl") { my $lib = ""; # Newer vcpkg definitions call this libcurl_imp.lib; Do we @@ -68,54 +68,8 @@ while (@ARGV) { } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") { $arg =~ s/^-L/-LIBPATH:/; push(@lflags, $arg); - } elsif ("$arg" =~ /^-[Rl]/) { + } elsif ("$arg" =~ /^-R/) { # eat - } elsif ("$arg" eq "-Werror") { - push(@cflags, "-WX"); - } elsif ("$arg" eq "-Wall") { - # cl.exe understands -Wall, but it is really overzealous - push(@cflags, "-W4"); - # disable the "signed/unsigned mismatch" warnings; our source code violates that - push(@cflags, "-wd4018"); - push(@cflags, "-wd4245"); - push(@cflags, "-wd4389"); - # disable the "unreferenced formal parameter" warning; our source code violates that - push(@cflags, "-wd4100"); - # disable the "conditional expression is constant" warning; our source code violates that - push(@cflags, "-wd4127"); - # disable the "const object should be initialized" warning; these warnings affect only objects that are `static` - push(@cflags, "-wd4132"); - # disable the "function/data pointer conversion in expression" warning; our source code violates that - push(@cflags, "-wd4152"); - # disable the "non-constant aggregate initializer" warning; our source code violates that - push(@cflags, "-wd4204"); - # disable the "cannot be initialized using address of automatic variable" warning; our source code violates that - push(@cflags, "-wd4221"); - # disable the "possible loss of data" warnings; our source code violates that - push(@cflags, "-wd4244"); - push(@cflags, "-wd4267"); - # disable the "array is too small to include a terminating null character" warning; we ab-use strings to initialize OIDs - push(@cflags, "-wd4295"); - # disable the "'<<': result of 32-bit shift implicitly converted to 64 bits" warning; our source code violates that - push(@cflags, "-wd4334"); - # disable the "declaration hides previous local declaration" warning; our source code violates that - push(@cflags, "-wd4456"); - # disable the "declaration hides function parameter" warning; our source code violates that - push(@cflags, "-wd4457"); - # disable the "declaration hides global declaration" warning; our source code violates that - push(@cflags, "-wd4459"); - # disable the "potentially uninitialized local variable '<name>' used" warning; our source code violates that - push(@cflags, "-wd4701"); - # disable the "unreachable code" warning; our source code violates that - push(@cflags, "-wd4702"); - # disable the "potentially uninitialized local pointer variable used" warning; our source code violates that - push(@cflags, "-wd4703"); - # disable the "assignment within conditional expression" warning; our source code violates that - push(@cflags, "-wd4706"); - # disable the "'inet_ntoa': Use inet_ntop() or InetNtop() instead" warning; our source code violates that - push(@cflags, "-wd4996"); - } elsif ("$arg" =~ /^-W[a-z]/) { - # let's ignore those } else { push(@args, $arg); } |