From 8e7984e5783877c58cddc7b4e668401580ab4467 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 26 Feb 2019 23:18:02 +0100 Subject: [PATCH] Configure: support a few more "make variables" defaulting from env CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS, and LDLIBS Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/8325) --- Configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Configure b/Configure index e2f9865f91..0e0e115e43 100755 --- a/Configure +++ b/Configure @@ -554,18 +554,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"), -- 2.25.1