diff options
author | Richard Levitte <levitte@openssl.org> | 2019-02-26 23:18:02 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-02-28 13:08:05 +0100 |
commit | 0342e42d864b7a670b4403389df057c4da6d7975 (patch) | |
tree | ff75ef4616b6eead1f6f929d2c58fc3f614bf248 /Configure | |
parent | 3dee23a6840add98798260e5faa76205e77120a5 (diff) |
Configure: support a few more "make variables" defaulting from env
CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS, and LDLIBS
(cherry picked from commit 8e7984e5783877c58cddc7b4e668401580ab4467)
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8359)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -550,18 +550,18 @@ my %user = ( AS => undef, ASFLAGS => [], CC => env('CC'), - CFLAGS => [], + CFLAGS => [ env('CFLAGS') || () ], CXX => env('CXX'), - CXXFLAGS => [], + CXXFLAGS => [ env('CXXFLAGS') || () ], CPP => undef, - CPPFLAGS => [], # -D, -I, -Wp, + CPPFLAGS => [ env('CPPFLAGS') || () ], # -D, -I, -Wp, CPPDEFINES => [], # Alternative for -D CPPINCLUDES => [], # Alternative for -I CROSS_COMPILE => env('CROSS_COMPILE'), HASHBANGPERL=> env('HASHBANGPERL') || env('PERL'), LD => undef, - LDFLAGS => [], # -L, -Wl, - LDLIBS => [], # -l + LDFLAGS => [ env('LDFLAGS') || () ], # -L, -Wl, + LDLIBS => [ env('LDLIBS') || () ], # -l MT => undef, MTFLAGS => [], PERL => env('PERL') || ($^O ne "VMS" ? $^X : "perl"), |