diff options
author | Richard Levitte <levitte@openssl.org> | 2018-03-16 08:59:03 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-03-16 10:28:41 +0100 |
commit | f58461791d3dbf94fbc5254a27fc45eff7f34a6c (patch) | |
tree | 9c6cebc048af06d2f607c8bf2c18bc7a5aca5fa3 /Configure | |
parent | ac6ae8a9fe25df159d04b7ea7c121c63fc05aae9 (diff) |
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)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -523,28 +523,30 @@ my $list_separator_re = { VMS => qr/(?<!\^),/, MSWin32 => qr/(?<!\\);/ } -> {$^O} // qr/(?<!\\)[:\s]/; # 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 = ( - AR => undef, + AR => env('AR'), ARFLAGS => [], AS => undef, ASFLAGS => [], - CC => undef, + CC => env('CC'), CFLAGS => [], - CXX => undef, + CXX => env('CXX'), CXXFLAGS => [], CPP => undef, CPPFLAGS => [], # -D, -I, -Wp, CPPDEFINES => [], # Alternative for -D CPPINCLUDES => [], # Alternative for -I - CROSS_COMPILE => undef, - HASHBANGPERL=> undef, + CROSS_COMPILE => env('CROSS_COMPILE'), + HASHBANGPERL=> env('HASHBANGPERL') || env('PERL'), LD => undef, LDFLAGS => [], # -L, -Wl, LDLIBS => [], # -l MT => undef, MTFLAGS => [], - RANLIB => undef, - RC => undef, + RANLIB => env('RANLIB'), + RC => env('RC') || env('WINDRES'), RCFLAGS => [], RM => undef, ); |