diff options
author | Richard Levitte <levitte@openssl.org> | 2016-08-29 21:46:29 +0200 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2016-08-30 06:07:06 +0200 |
commit | eac33e1cd3a45ab0d66be20a01ee9a5c0634781b (patch) | |
tree | 1a88fa1a877ed5e02988c3ba5ea0c4df625ba290 /Configure | |
parent | b7fa463ff846223abc23a70c76848f97ce82e8f2 (diff) |
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)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 21 |
1 files changed, 0 insertions, 21 deletions
@@ -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"; } |