Commit 36f7be2c authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5177)
parent 085ed4f1

Configurations/00-base-templates.conf

+15 −3
Original line number Diff line number Diff line
@@ -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",



	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 => {