提交 95b2ebdf 编写于 作者: R Richard Levitte

When someone configures an out-of-source build, switch to unified

For example, this works instead of giving a big error message (note
the lack of '--unified'):

    mkdir ../_build
    (cd ../_build/; ../openssl-src/config; make)
Reviewed-by: NAndy Polyakov <appro@openssl.org>
上级 d918f9cb
...@@ -885,9 +885,10 @@ $target{build_scheme} = [ $target{build_scheme} ] ...@@ -885,9 +885,10 @@ $target{build_scheme} = [ $target{build_scheme} ]
###### TO BE REMOVED BEFORE FINAL RELEASE ###### TO BE REMOVED BEFORE FINAL RELEASE
###### ######
###### If the user has chosen --unified, we give it to them. ###### If the user has chosen --unified, we give it to them.
###### The same happens if we detect that they try to build out-of-source.
if ($target{build_file} eq "Makefile" if ($target{build_file} eq "Makefile"
&& $target{build_scheme}->[0] eq "unixmake" && $target{build_scheme}->[0] eq "unixmake"
&& $unified) { && ($unified || $srcdir ne $blddir)) {
$target{build_scheme} = [ "unified", "unix" ]; $target{build_scheme} = [ "unified", "unix" ];
} }
...@@ -1704,13 +1705,6 @@ EOF ...@@ -1704,13 +1705,6 @@ EOF
print OUT "1;\n"; print OUT "1;\n";
close(OUT); close(OUT);
die <<"EOF" if $builder ne "unified" && $srcdir ne $blddir;
***** Trying building anywhere else than in the source tree will not
***** work for target $config{target}. To make it possible, it needs
***** to use the "unified" build scheme.
EOF
print "IsMK1MF =", ($builder eq "mk1mf" ? "yes" : "no"), "\n"; print "IsMK1MF =", ($builder eq "mk1mf" ? "yes" : "no"), "\n";
print "CC =$target{cc}\n"; print "CC =$target{cc}\n";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册