diff options
author | Richard Levitte <levitte@openssl.org> | 2016-08-29 21:45:19 +0200 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2016-08-30 06:07:06 +0200 |
commit | b7fa463ff846223abc23a70c76848f97ce82e8f2 (patch) | |
tree | 8eda486d359bfdb182bb7eb096cac27bf4e08f77 /Configure | |
parent | 2aca84ffadaaafe9ed9cccaeef09ea15574994a5 (diff) |
Make it possible for the user to specify a different default build file
Make sure the information is kept for reconfiguration too.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 8b5156d18855f536cf5ceac10f5781e19fa8f1ea)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -502,11 +502,14 @@ if (grep /^reconf(igure)?$/, @argvcopy) { if defined($configdata::config{cross_compile_prefix}); $ENV{CC} = $configdata::config{cc} if defined($configdata::config{cc}); + $ENV{BUILDFILE} = $configdata::config{build_file} + if defined($configdata::config{build_file}); print "Reconfiguring with: ", join(" ",@argvcopy), "\n"; print " CROSS_COMPILE = ",$ENV{CROSS_COMPILE},"\n" if $ENV{CROSS_COMPILE}; print " CC = ",$ENV{CC},"\n" if $ENV{CC}; + print " BUILDFILE = ",$ENV{BUILDFILE},"\n" if $ENV{BUILDFILE}; } elsif (open IN, "<Makefile") { # # THIS SECTION IS TEMPORARY, it helps transitioning from Makefile @@ -938,8 +941,12 @@ $target{nm} = $ENV{'NM'} || $target{nm} || "nm"; $target{rc} = $ENV{'RC'} || $ENV{'WINDRES'} || $target{rc} || "windres"; -# Cache the C compiler command for reconfiguration +# Allow overriding the build file name +$target{build_file} = $ENV{BUILDFILE} || $target{build_file} || "Makefile"; + +# Cache information necessary for reconfiguration $config{cc} = $target{cc}; +$config{build_file} = $target{build_file}; # For cflags, lflags, plib_lflags, ex_libs and defines, add the debug_ # or release_ attributes. |