提交 8b5156d1 编写于 作者: R Richard Levitte

Make it possible for the user to specify a different default build file

Make sure the information is kept for reconfiguration too.
Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 d8f432aa
...@@ -502,11 +502,14 @@ if (grep /^reconf(igure)?$/, @argvcopy) { ...@@ -502,11 +502,14 @@ if (grep /^reconf(igure)?$/, @argvcopy) {
if defined($configdata::config{cross_compile_prefix}); if defined($configdata::config{cross_compile_prefix});
$ENV{CC} = $configdata::config{cc} $ENV{CC} = $configdata::config{cc}
if defined($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 "Reconfiguring with: ", join(" ",@argvcopy), "\n";
print " CROSS_COMPILE = ",$ENV{CROSS_COMPILE},"\n" print " CROSS_COMPILE = ",$ENV{CROSS_COMPILE},"\n"
if $ENV{CROSS_COMPILE}; if $ENV{CROSS_COMPILE};
print " CC = ",$ENV{CC},"\n" if $ENV{CC}; print " CC = ",$ENV{CC},"\n" if $ENV{CC};
print " BUILDFILE = ",$ENV{BUILDFILE},"\n" if $ENV{BUILDFILE};
} elsif (open IN, "<Makefile") { } elsif (open IN, "<Makefile") {
# #
# THIS SECTION IS TEMPORARY, it helps transitioning from Makefile # THIS SECTION IS TEMPORARY, it helps transitioning from Makefile
...@@ -938,8 +941,12 @@ $target{nm} = $ENV{'NM'} || $target{nm} || "nm"; ...@@ -938,8 +941,12 @@ $target{nm} = $ENV{'NM'} || $target{nm} || "nm";
$target{rc} = $target{rc} =
$ENV{'RC'} || $ENV{'WINDRES'} || $target{rc} || "windres"; $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{cc} = $target{cc};
$config{build_file} = $target{build_file};
# For cflags, lflags, plib_lflags, ex_libs and defines, add the debug_ # For cflags, lflags, plib_lflags, ex_libs and defines, add the debug_
# or release_ attributes. # or release_ attributes.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册