diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-01-27 13:01:44 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-01-28 07:26:11 +0100 |
| commit | 36f7be2c2f35bc408c38de611566fae0de0a3b58 (patch) | |
| tree | c1aa4c5e774d1f2817b31bda44b48a5049eb4cbf /Configurations | |
| parent | 085ed4f15a8a5eb9ac7fd1151f7a3308d4372c04 (diff) | |
We need Unixly defaults for config targets that don't inherit a BASE
Ideally, each config target should inherit a base to get their
platform specific defaults. Unfortunately, that is currently not the
case, so we duplicate the Unixly defaults from the BASE_unix template
into the DEFAULT template.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5177)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index e24baf1f53..72cbde203f 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -38,10 +38,22 @@ my %targets=( shared_rcflag => "", shared_extension => "", - hashbangperl => "PERL", # Only Unix actually cares + #### Defaults for the benefit of the config targets who don't inherit + #### a BASE and assume Unixly defaults + #### THESE WILL DISAPPEAR IN OpenSSL 1.2 + build_scheme => [ "unified", "unix" ], + build_file => "Makefile", - build_scheme => [ "unified", "unix" ], - build_file => "Makefile", + ar => "ar", + arflags => "r", + cc => "cc", + hashbangperl => "/usr/bin/env perl", + ranlib => sub { which("$config{cross_compile_prefix}ranlib") ? + "\$(CROSS_COMPILE)ranlib" : "true"; }, + rc => "windres", + + #### THESE WILL BE ENABLED IN OpenSSL 1.2 + #hashbangperl => "PERL", # Only Unix actually cares }, BASE_common => { |