diff options
author | Richard Levitte <levitte@openssl.org> | 2019-06-16 12:56:21 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
commit | 989b2ad786ee43438bbb8b33f857ba0ce6e10082 (patch) | |
tree | c151998c5fa3114d713ec4b6e649502f9cfb3dcc /Configurations/10-main.conf | |
parent | b19fe714e9d4c50dcb33259346f06d3924b337b7 (diff) |
Move uplink file information to build.info files
This file information was hidden in config target files, when they
should really be part of build.info like any other file we build
from. With build.info variables, the task became much easier.
We take the opportunity to move apps_init_src and apps_aux_src to
apps/build.info as well, and to clean up apps/build.info.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'Configurations/10-main.conf')
-rw-r--r-- | Configurations/10-main.conf | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 6a8d839713..8d52aa1650 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1216,7 +1216,6 @@ my %targets = ( shared_target => "win-shared", # meaningless except it gives Configure a hint thread_scheme => "winthreads", dso_scheme => "win32", - apps_aux_src => add("win32_init.c"), bn_ops => "EXPORT_VAR_AS_FN", perl_platform => 'Windows::MSVC', # additional parameter to build_scheme denotes install-path "flavour" @@ -1272,8 +1271,7 @@ my %targets = ( bn_ops => add("SIXTY_FOUR_BIT"), }, "VC-WIN64I" => { - inherit_from => [ "VC-WIN64-common", asm("ia64_asm"), - sub { $disabled{uplink} ? () : "ia64_uplink" } ], + inherit_from => [ "VC-WIN64-common", asm("ia64_asm") ], AS => "ias", ASFLAGS => "-d debug", asoutflag => "-o ", @@ -1285,8 +1283,7 @@ my %targets = ( multilib => "-ia64", }, "VC-WIN64A" => { - inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), - sub { $disabled{uplink} ? () : "x86_64_uplink" } ], + inherit_from => [ "VC-WIN64-common", asm("x86_64_asm") ], AS => sub { vc_win64a_info()->{AS} }, ASFLAGS => sub { vc_win64a_info()->{ASFLAGS} }, asoutflag => sub { vc_win64a_info()->{asoutflag} }, @@ -1299,8 +1296,7 @@ my %targets = ( multilib => "-x64", }, "VC-WIN32" => { - inherit_from => [ "VC-noCE-common", asm("x86_asm"), - sub { $disabled{uplink} ? () : "uplink_common" } ], + inherit_from => [ "VC-noCE-common", asm("x86_asm") ], CFLAGS => add("/WX"), AS => sub { vc_win32_info()->{AS} }, ASFLAGS => sub { vc_win32_info()->{ASFLAGS} }, @@ -1308,7 +1304,7 @@ my %targets = ( asflags => sub { vc_win32_info()->{asflags} }, sys_id => "WIN32", bn_ops => add("BN_LLONG"), - uplink_arch => 'x86', + uplink_arch => 'common', perlasm_scheme => sub { vc_win32_info()->{perlasm_scheme} }, # "WOW" stands for "Windows on Windows", and "VC-WOW" engages # some installation path heuristics in windows-makefile.tmpl... @@ -1379,13 +1375,11 @@ my %targets = ( shared_target => "mingw-shared", shared_cppflags => add("_WINDLL"), shared_ldflag => "-static-libgcc", - apps_aux_src => add("win32_init.c"), perl_platform => 'mingw', }, "mingw" => { - inherit_from => [ "mingw-common", asm("x86_asm"), - sub { $disabled{uplink} ? () : "x86_uplink" } ], + inherit_from => [ "mingw-common", asm("x86_asm") ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), cflags => "-m32", sys_id => "MINGW32", @@ -1730,8 +1724,6 @@ my %targets = ( disable => add('pinshared'), - apps_aux_src => "vms_term_sock.c vms_decc_argv.c", - apps_init_src => "vms_decc_init.c", }, # From HELP CC/POINTER_SIZE: |