Move VS Tools configuration to VC-common target

The Windows toolchain is composed of utilites from both the Windows SDK
and the Visual Studio Build Tools. Move the configuration of the latter
utilities into the `VC-common` template inside `10-main.conf`, while
leaving the former utilities in `BASE_Windows`. This allows for other
Windows compilers to be configured inheriting from `BASE_Windows`.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13540)

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 1da5c5f0d04e209b699fe9091984c9882c2b9019..3c569814aeb6c5fdf5d391b7d730cd3e8491114c 100644 (file)
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -108,12 +108,6 @@ my %targets=(
                 return ();
             },
 
-        LD              => "link",
-        LDFLAGS         => "/nologo",
-        ldoutflag       => "/out:",
-        AR              => "lib",
-        ARFLAGS         => "/nologo",
-        aroutflag       => "/out:",
         RC               => "rc",
         rcoutflag        => "/fo",
         MT              => "mt",

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 9529bbfe5c864d19de7494faafea8da56e4ee755..f8509feb39c5517ba40d7e03d9e568ede1f1c319 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1277,8 +1277,13 @@ my %targets = (
         CC               => "cl",
         CPP              => '$(CC) /EP /C',
         CFLAGS           => "/W3 /wd4090 /nologo",
-        LDFLAGS          => add("/debug"),
         coutflag         => "/Fo",
+        LD               => "link",
+        LDFLAGS          => "/nologo /debug",
+        ldoutflag        => "/out:",
+        AR               => "lib",
+        ARFLAGS          => "/nologo",
+        aroutflag        => "/out:",
         defines          => add("OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN",
                                 "UNICODE", "_UNICODE",
                                 "_CRT_SECURE_NO_DEPRECATE",