diff options
| author | Nicholas Clark <nick@ccl4.org> | 2011-10-07 23:07:50 +0200 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2011-10-07 23:07:50 +0200 |
| commit | fdbac266ba9ef2a6f3bed61052973e72dc637ed1 (patch) | |
| tree | 569b848f035aa3ba122645faeb15d013da473515 | |
| parent | 5fceabf37802cb6e9aa4c0cdde30378472046822 (diff) | |
| download | perl-fdbac266ba9ef2a6f3bed61052973e72dc637ed1.tar.gz | |
bisect-runner.pl needs to set @paths correctly on 32 bit Linux
Without this, Configure may fail prior to commit 1cfa4ec74d4933da (which
added the 'ignore_versioned_solibs' logic), because bisect-runner.pl's code
to set libs relies on successfully finding at least one library to pass to
./Configure with -Dlibs=
miniperl and perl should now build back to perl-5.000 on 32 bit Linux.
test_prep may not work, as early versions of DB_File.xs will fail if a
new db.h is found.
| -rwxr-xr-x | Porting/bisect-runner.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl index 287a77bc79..e81cae0e74 100755 --- a/Porting/bisect-runner.pl +++ b/Porting/bisect-runner.pl @@ -26,7 +26,9 @@ my %options = clean => 1, # mostly for debugging this ); -my @paths = qw(/usr/local/lib64 /lib64 /usr/lib64); +my $linux64 = `uname -sm` eq "Linux x86_64\n" ? '64' : ''; + +my @paths = map {$_ . $linux64} qw(/usr/local/lib /lib /usr/lib); my %defines = ( @@ -34,7 +36,7 @@ my %defines = optimize => '-g', cc => 'ccache gcc', ld => 'gcc', - (`uname -sm` eq "Linux x86_64\n" ? (libpth => \@paths) : ()), + ($linux64 ? (libpth => \@paths) : ()), ); unless(GetOptions(\%options, |