mirror of
https://github.com/QuasarApp/openssl.git
synced 2025-05-14 10:29:42 +00:00
Configure: clean away temporary section of code
We've done away with Makefile as source of information and now use configdata.pm exclusively. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit acc63c7d6d4ea28497a6192a3445b40f2af88133)
This commit is contained in:
parent
b7fa463ff8
commit
eac33e1cd3
21
Configure
21
Configure
@ -510,27 +510,6 @@ if (grep /^reconf(igure)?$/, @argvcopy) {
|
||||
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
|
||||
# centered information gathering the reading configdata.pm
|
||||
#
|
||||
while (<IN>) {
|
||||
s|\R$||;
|
||||
if (/^CONFIGURE_ARGS=\s*(.*)\s*/) {
|
||||
# Older form, we split the string and hope for the best
|
||||
@argvcopy = split /\s+/, $_;
|
||||
die "Incorrect data to reconfigure, please do a normal configuration\n"
|
||||
if (grep(/^reconf/,@argvcopy));
|
||||
} elsif (/^CROSS_COMPILE=\s*(.*)/) {
|
||||
$ENV{CROSS_COMPILE}=$1;
|
||||
} elsif (/^CC=\s*(?:\$\(CROSS_COMPILE\))?(.*?)$/) {
|
||||
$ENV{CC}=$1;
|
||||
}
|
||||
}
|
||||
#
|
||||
# END OF TEMPORARY SECTION
|
||||
#
|
||||
} else {
|
||||
die "Insufficient data to reconfigure, please do a normal configuration\n";
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user