diff options
| author | Tanzinul Islam <tanzinul.islam@gmail.com> | 2020-11-07 13:13:34 +0000 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2021-04-19 11:05:54 +0200 |
| commit | 23f3242ffe8613411714eb9350275371059c7bfe (patch) | |
| tree | 9f64946734a36696336fb6aada87a79992e945bc /Configurations | |
| parent | 1bb381227b432676451ead3f9d4b92352464e9cc (diff) | |
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)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 6 | ||||
| -rw-r--r-- | Configurations/10-main.conf | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 1da5c5f0d0..3c569814ae 100644 --- 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 9529bbfe5c..f8509feb39 100644 --- 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", |