diff options
author | Richard Levitte <levitte@openssl.org> | 2018-03-06 20:35:30 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-03-08 17:24:02 +0100 |
commit | abe256e7951e6d57f8f6b4364ea696eb4ead3852 (patch) | |
tree | c135023d8af4063a2907a349cb580bebb92849aa /Configurations/00-base-templates.conf | |
parent | 48dcca265c9cb0c26459240ab1858577dacf9e67 (diff) |
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
Diffstat (limited to 'Configurations/00-base-templates.conf')
-rw-r--r-- | Configurations/00-base-templates.conf | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 0350997ff7..310a37091e 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -46,16 +46,16 @@ my %targets=( 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") + AR => "ar", + ARFLAGS => "r", + CC => "cc", + HASHBANGPERL => "/usr/bin/env perl", + RANLIB => sub { which("$config{cross_compile_prefix}ranlib") ? "ranlib" : "" }, - rc => "windres", + RC => "windres", #### THESE WILL BE ENABLED IN OpenSSL 1.2 - #hashbangperl => "PERL", # Only Unix actually cares + #HASHBANGPERL => "PERL", # Only Unix actually cares }, BASE_common => { @@ -84,19 +84,19 @@ my %targets=( inherit_from => [ "BASE_common" ], template => 1, - ar => "ar", - arflags => "r", - cc => "cc", + 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") + HASHBANGPERL => "/usr/bin/env perl", # Only Unix actually cares + RANLIB => sub { which("$config{cross_compile_prefix}ranlib") ? "ranlib" : "" }, - rc => "windres", + RC => "windres", build_scheme => [ "unified", "unix" ], build_file => "Makefile", @@ -116,16 +116,16 @@ my %targets=( return (); }, - ld => "link", - lflags => "/nologo", - loutflag => "/out:", - ar => "lib", - arflags => "/nologo", + LD => "link", + LDFLAGS => "/nologo", + ldoutflag => "/out:", + AR => "lib", + ARFLAGS => "/nologo", aroutflag => "/out:", - rc => "rc", + RC => "rc", rcoutflag => "/fo", - mt => "mt", - mtflags => "-nologo", + MT => "mt", + MTFLAGS => "-nologo", mtinflag => "-manifest ", mtoutflag => "-outputresource:", |