Commit 758baa3d authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Configure: impose ^X on whole build procedure. 



Traditionally Configure passed $ENV{PERL} to Makefile. But this
resulted in ambiguilty as Configure script could be executed by
interpreter different from one executing remaining scripts. Since
we separate compile- and run-time interpreters with HASHBANGPERL
variable, there is no reason to segment the build procedure.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 77a6be4d

Configure

+2 −18
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ $config{cross_compile_prefix} = $ENV{'CROSS_COMPILE'} 
# Allow overriding the names of some tools.  USE WITH CARE

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

# the default string.

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

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

$config{hashbangperl} =

    $ENV{'HASHBANGPERL'}           || $ENV{'PERL'}     || "/usr/bin/env perl";

$target{cc} =      $ENV{'CC'}      || $target{cc}      || "cc";
@@ -2019,11 +2019,10 @@ EOF 
print OUT "1;\n";

close(OUT);



my $perlvers = &get_perl_version();

print "\n";

print "PROCESSOR     =$config{processor}\n" if $config{processor};

print "PERL          =$config{perl}\n";

print "PERLVERSION   =$perlvers\n";

print "PERLVERSION   =$Config{version} for $Config{archname}\n";

print "HASHBANGPERL  =$config{hashbangperl}\n";

print "CC            =$config{cross_compile_prefix}$target{cc}\n";

print "CFLAG         =$target{cflags} $config{cflags}\n";
@@ -2384,21 +2383,6 @@ sub usage 
	exit(1);

	}



# Return the perl version.

sub get_perl_version

{

    return "$Config{version} for $Config{archname}" if $config{perl} eq $^X;

    my $l;

    open my $FH, "$config{perl} -v|" || return "??unknown??";

    while ( <$FH> ) {

        chop;

        $l .= $_;

    }

    close $FH;

    $l =~ s/This is (.{1,70}).*/$1/;

    return $l;

}



sub run_dofile

{

    my $out = shift;

INSTALL

+3 −0
Original line number Diff line number Diff line
@@ -812,6 +812,9 @@ 


 PERL

                The name of the Perl executable to use when building OpenSSL.

                This variable is used in config script only. Configure on the

                other hand imposes the interpreter by which it itself was

                executed on the whole build procedure.



 HASHBANGPERL

                The command string for the Perl executable to insert in the