openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Configure: maintain compability with pre-"make variables" Configure 

There were a few environment variables that we supported in earlier
Configure versions which got transfered to the %user table.  This
change makes sure that we still support them, by simply pre-populating
the corresponding %user entries with those environment values.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
This commit is contained in:
Richard Levitte 2018-03-16 08:59:03 +01:00
parent ac6ae8a9fe
commit f58461791d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Configure
View File

@ -523,28 +523,30 @@ my $list_separator_re =
{ VMS => qr/(?<!\^),/, { VMS => qr/(?<!\^),/,
MSWin32 => qr/(?<!\\);/ } -> {$^O} // qr/(?<!\\)[:\s]/; MSWin32 => qr/(?<!\\);/ } -> {$^O} // qr/(?<!\\)[:\s]/;
# All the "make variables" we support # All the "make variables" we support
# Some get pre-populated for the sake of backward compatibility
# (we supported those before the change to "make variable" support.
my %user = ( my %user = (
AR => undef, AR => env('AR'),
ARFLAGS => [], ARFLAGS => [],
AS => undef, AS => undef,
ASFLAGS => [], ASFLAGS => [],
CC => undef, CC => env('CC'),
CFLAGS => [], CFLAGS => [],
CXX => undef, CXX => env('CXX'),
CXXFLAGS => [], CXXFLAGS => [],
CPP => undef, CPP => undef,
CPPFLAGS => [], # -D, -I, -Wp, CPPFLAGS => [], # -D, -I, -Wp,
CPPDEFINES => [], # Alternative for -D CPPDEFINES => [], # Alternative for -D
CPPINCLUDES => [], # Alternative for -I CPPINCLUDES => [], # Alternative for -I
CROSS_COMPILE => undef, CROSS_COMPILE => env('CROSS_COMPILE'),
HASHBANGPERL=> undef, HASHBANGPERL=> env('HASHBANGPERL') || env('PERL'),
LD => undef, LD => undef,
LDFLAGS => [], # -L, -Wl, LDFLAGS => [], # -L, -Wl,
LDLIBS => [], # -l LDLIBS => [], # -l
MT => undef, MT => undef,
MTFLAGS => [], MTFLAGS => [],
RANLIB => undef, RANLIB => env('RANLIB'),
RC => undef, RC => env('RC') || env('WINDRES'),
RCFLAGS => [], RCFLAGS => [],
RM => undef, RM => undef,
); );