diff options
author | Richard Levitte <levitte@openssl.org> | 2021-08-24 13:45:27 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-08-25 16:51:47 +0200 |
commit | 1501de3380aa1907a6b27c734a3c30f0962048ed (patch) | |
tree | f3d3973b15690204aa351e8c10dc831161c501e5 /Configurations | |
parent | 33a62d448c95c01a5bff7be8a00bf95b6a6a6f37 (diff) |
Add multilib to the NonStop configuration definitions.
Fixes: #16373
Co-authored-by: Randall S. Becker <rsbecker@nexbridge.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16398)
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/50-nonstop.conf | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf index 7524c50016..ed3fe828b3 100644 --- a/Configurations/50-nonstop.conf +++ b/Configurations/50-nonstop.conf @@ -203,12 +203,14 @@ 'nonstop-ilp32', 'nonstop-efloat-x86_64', 'nonstop-model-put' ], + multilib => '-put', }, 'nonstop-nsx_64' => { inherit_from => [ 'nonstop-common', 'nonstop-archenv-x86_64-oss', 'nonstop-lp64-x86_64', 'nonstop-efloat-x86_64' ], + multilib => '64', disable => ['threads'], }, 'nonstop-nsx_64_put' => { @@ -217,13 +219,15 @@ 'nonstop-lp64-x86_64', 'nonstop-efloat-x86_64', 'nonstop-model-put' ], + multilib => '64-put', }, 'nonstop-nsx_spt' => { inherit_from => [ 'nonstop-common', - 'nonstop-archenv-x86_64-oss', + 'nonstop-archenv-x86_64-oss', 'nonstop-ilp32', 'nonstop-efloat-x86_64', 'nonstop-model-spt' ], + multilib => '-spt', }, 'nonstop-nsx_spt_floss' => { inherit_from => [ 'nonstop-common', @@ -232,6 +236,7 @@ 'nonstop-efloat-x86_64', 'nonstop-model-floss', 'nonstop-model-spt'], + multilib => '-spt', }, 'nonstop-nsx_g' => { inherit_from => [ 'nonstop-common', @@ -261,12 +266,14 @@ 'nonstop-ilp32', 'nonstop-efloat-itanium', 'nonstop-model-put' ], + multilib => '-put', }, 'nonstop-nse_64' => { inherit_from => [ 'nonstop-common', 'nonstop-archenv-itanium-oss', 'nonstop-lp64-itanium', 'nonstop-efloat-itanium' ], + multilib => '64', disable => ['threads'], }, 'nonstop-nse_64_put' => { @@ -275,6 +282,7 @@ 'nonstop-lp64-itanium', 'nonstop-efloat-itanium', 'nonstop-model-put' ], + multilib => '64-put', }, 'nonstop-nse_spt' => { inherit_from => [ 'nonstop-common', @@ -282,6 +290,7 @@ 'nonstop-ilp32', 'nonstop-efloat-itanium', 'nonstop-model-spt' ], + multilib => '-spt', }, 'nonstop-nse_spt_floss' => { inherit_from => [ 'nonstop-common', @@ -289,6 +298,7 @@ 'nonstop-ilp32', 'nonstop-efloat-itanium', 'nonstop-model-floss', 'nonstop-model-spt' ], + multilib => '-spt', }, 'nonstop-nse_g' => { inherit_from => [ 'nonstop-common', |