diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-03-03 22:26:45 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-03-09 15:04:44 +0100 |
| commit | 6a145a32f2cc6c19263a3c02281ced074da03c8e (patch) | |
| tree | 53d9db021c33a2960e2d0376808c49a870cf7937 /Configurations/10-main.conf | |
| parent | c059564ab02122be574deb0f493be00a6b32b147 (diff) | |
Configurations/windows-makefile.tmpl: simplify install-path "flavour"-ing.
$target{build_scheme} consists of fixed number of elements with 3rd
element denoting VC install-path "flavour", i.e. where to install things.
Instead of looking at 3rd, let's look at last. This allows to override
flavour from template in a simple way.
Configurations/10-main.conf: define generic "flavour" in VC-common
template. Since VC-W32 was the only recognized "flavour", remove
"flavour" definitions from all targets/templates, but VC-WIN32. And
rename VC-W32 to VC-WOW.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5502)
Diffstat (limited to 'Configurations/10-main.conf')
| -rw-r--r-- | Configurations/10-main.conf | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 101d3fcad1..6b57549c66 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1386,6 +1386,8 @@ my %targets = ( thread_scheme => "winthreads", dso_scheme => "win32", apps_aux_src => add("win32_init.c"), + # additional parameter to build_scheme denotes install-path "flavour" + build_scheme => add("VC-common", { separator => undef }), }, "VC-noCE-common" => { inherit_from => [ "VC-common" ], @@ -1434,7 +1436,6 @@ my %targets = ( return join(" ", @_, @ex_libs); }), bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN", - build_scheme => add("VC-W64", { separator => undef }), }, "VC-WIN64I" => { inherit_from => [ "VC-WIN64-common", asm("ia64_asm"), @@ -1484,7 +1485,9 @@ my %targets = ( sys_id => "WIN32", bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", perlasm_scheme => sub { vc_win32_info()->{perlasm_scheme} }, - build_scheme => add("VC-W32", { separator => undef }), + # "WOW" stands for "Windows on Windows", and "VC-WOW" engages + # some installation path heuristics in windows-makefile.tmpl... + build_scheme => add("VC-WOW", { separator => undef }), }, "VC-CE" => { inherit_from => [ "VC-common" ], @@ -1539,7 +1542,6 @@ my %targets = ( if (env('TARGETCPU') eq "X86"); return @ex_libs; }), - build_scheme => add("VC-WCE", { separator => undef }), }, #### MinGW |