Configure: clean away temporary section of code
authorRichard Levitte <levitte@openssl.org>
Mon, 29 Aug 2016 19:46:29 +0000 (21:46 +0200)
committerRichard Levitte <levitte@openssl.org>
Tue, 30 Aug 2016 03:13:11 +0000 (05:13 +0200)
We've done away with Makefile as source of information and now use
configdata.pm exclusively.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Configure

index a0bf5de..dda0ae7 100755 (executable)
--- 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";
     }