diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-01-27 12:13:35 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-01-28 07:26:11 +0100 |
| commit | 085ed4f15a8a5eb9ac7fd1151f7a3308d4372c04 (patch) | |
| tree | b299bd58d25d4e479e6e3678d24291adcf955842 /Configurations | |
| parent | 5b18235a186dd28ec7a37ed95e29f4ab61f2bcbe (diff) | |
Stop having Unix defaults in Configure (partial)
Default values belong in the DEFAULT config target template, in
Configurations/00-base-templates.conf.
This isn't a complete move, but takes care of the most blatant
examples.
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 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 1a2964520a..e24baf1f53 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -38,6 +38,8 @@ my %targets=( shared_rcflag => "", shared_extension => "", + hashbangperl => "PERL", # Only Unix actually cares + build_scheme => [ "unified", "unix" ], build_file => "Makefile", }, @@ -61,12 +63,19 @@ my %targets=( inherit_from => [ "BASE_common" ], template => 1, + ar => "ar", + arflags => "r", + cc => "cc", lflags => sub { $withargs{zlib_lib} ? "-L".$withargs{zlib_lib} : () }, ex_libs => sub { !defined($disabled{zlib}) && defined($disabled{"zlib-dynamic"}) ? "-lz" : () }, + hashbangperl => "/usr/bin/env perl", # Only Unix actually cares + ranlib => sub { which("$config{cross_compile_prefix}ranlib") ? + "\$(CROSS_COMPILE)ranlib" : "true"; }, + rc => "windres", build_scheme => [ "unified", "unix" ], build_file => "Makefile", |