summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-08-29 21:46:29 +0200
committerRichard Levitte <levitte@openssl.org>2016-08-30 05:13:11 +0200
commitacc63c7d6d4ea28497a6192a3445b40f2af88133 (patch)
treebc619aa5decde63937b30c4007332c550b03760a /Configure
parent8b5156d18855f536cf5ceac10f5781e19fa8f1ea (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>
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure21
1 files changed, 0 insertions, 21 deletions
diff --git a/Configure b/Configure
index a0bf5de8bb..dda0ae7df1 100755
--- a/Configure
+++ b/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";
}