Commit 9e265322 authored by Richard Levitte's avatar Richard Levitte
Browse files

Keep supporting the env / make variable PERL 



OpenSSL 1.1.0 supports the use of this environment variable for
passing to the build files.  For the sake of backward compatibility,
we keep it.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/6668)
parent b7b13c7a

Configurations/descrip.mms.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ CFLAGS={- join('', @{$config{CFLAGS}}) -} 
LDFLAGS={- join('', @{$config{LFLAGS}}) -}

EX_LIBS={- join('', map { ",$_" } @{$config{LDLIBS}}) -}



PERL={- $config{perl} -}

PERL={- $config{PERL} -}



AS={- $config{AS} -}

ASFLAGS={- join(' ', @{$config{ASFLAGS}}) -}

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ EX_LIBS= {- join(' ', @{$config{LDLIBS}}) -} 


MAKEDEPEND={- $config{makedepprog} -}



PERL={- $config{perl} -}

PERL={- $config{PERL} -}



AR=$(CROSS_COMPILE){- $config{AR} -}

ARFLAGS= {- join(' ', @{$config{ARFLAGS}}) -}

Configurations/windows-makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ LD={- $config{LD} -} 
LDFLAGS={- join(' ', @{$config{LDFLAGS}}) -}

EX_LIBS={- join(' ', @{$config{LDLIBS}}) -}



PERL={- $config{perl} -}

PERL={- $config{PERL} -}



AR={- $config{AR} -}

ARFLAGS= {- join(' ', @{$config{ARFLAGS}}) -}

Configure

+5 −6
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ my %user = ( 
    LDLIBS      => [],  # -l

    MT          => undef,

    MTFLAGS     => [],

    PERL        => env('PERL') || ($^O ne "VMS" ? $^X : "perl"),

    RANLIB      => env('RANLIB'),

    RC          => env('RC') || env('WINDRES'),

    RCFLAGS     => [],
@@ -1117,10 +1118,8 @@ $target{dso_extension}//=$target{shared_extension_simple}; 
($target{shared_import_extension}=$target{shared_extension_simple}.".a")

    if ($config{target} =~ /^(?:Cygwin|mingw)/);



# Allow overriding the names of some tools.  USE WITH CARE

# Note: only Unix cares about HASHBANGPERL...  that explains

# the default string.

$config{perl} =    ($^O ne "VMS" ? $^X : "perl");

# Fill %config with values from %user, and in case those are undefined or

# empty, use values from %target (acting as a default).

foreach (keys %user) {

    my $ref_type = ref $user{$_};
@@ -2459,7 +2458,7 @@ _____ 
    if ($dump || $cmdline) {

        print "\nCommand line (with current working directory = $here):\n\n";

        print '    ',join(' ',

                          $config{perl},

                          $config{PERL},

                          catfile($config{sourcedir}, 'Configure'),

                          @{$config{perlargv}}), "\n";

        print "\nPerl information:\n\n";
@@ -3065,7 +3064,7 @@ sub run_dofile 
    foreach (@templates) {

        die "Can't open $_, $!" unless -f $_;

    }

    my $perlcmd = (quotify("maybeshell", $config{perl}))[0];

    my $perlcmd = (quotify("maybeshell", $config{PERL}))[0];

    my $cmd = "$perlcmd \"-I.\" \"-Mconfigdata\" \"$dofile\" -o\"Configure\" \"".join("\" \"",@templates)."\" > \"$out.new\"";

    #print STDERR "DEBUG[run_dofile]: \$cmd = $cmd\n";

    system($cmd);