use File::Spec;
sub validate_exe {
- my ($name) = @_;
+ my ($name, $preferred_path) = @_;
my (@candidates, @args);
if (File::Spec->file_name_is_absolute($name)) {
# No need to look for args if the name is absolute.
@candidates = $name;
} else {
+ my @path;
+ if (defined $preferred_path) {
+ @path = ($preferred_path, grep { $_ ne $preferred_path } File::Spec->path);
+ } else {
+ @path = File::Spec->path;
+ }
+
(my $base, @args) = split ' ', $name;
- for my $path_entry (File::Spec->path) {
+ for my $path_entry (@path) {
my ($vol, $dir, $file) = File::Spec->splitpath($path_entry, 1);
next if defined $file and length $file;
push @candidates, File::Spec->catpath($vol, $dir, $base);
}
sub check_exe {
- my ($desc, $arg_var, $config_var, $env_var) = @_;
+ my ($desc, $arg_var, $config_var, $env_var, $preferred_path) = @_;
my $exe;
for (@ARGV) {
if (/^\Q$arg_var\E=(.*)/) {
- $exe = validate_exe($1);
+ $exe = validate_exe($1, $preferred_path);
last if defined $exe;
}
}
print "Forcing the use of $exe as the $desc.\n";
} else {
print "Checking for a valid $desc in the PATH... ";
- $exe = validate_exe($Config{$config_var});
+ $exe = validate_exe($Config{$config_var}, $preferred_path);
# Only fall back to env if we cannot find the one used to build perl.
if (not defined $exe and defined $ENV{$env_var}) {
- $exe = validate_exe($ENV{$env_var});
+ $exe = validate_exe($ENV{$env_var}, $preferred_path);
}
if (defined $exe) {
print "$exe\n";
unless ($pp) {
$cc = check_exe('C compiler', 'CC', 'cc', 'CC');
if (defined $cc) {
- $ld = check_exe('linker', 'LD', 'ld', 'LD');
+ my ($vol, $dir, $file) = File::Spec->splitpath($cc);
+ my $preferred_path = File::Spec->catpath($vol, $dir, '');
+ $ld = check_exe('linker', 'LD', 'ld', 'LD', $preferred_path);
}
}
$PARAMS{CC} = $cc;
$PARAMS{LD} = $ld;
- my $unit = { bits => 8, size => 1 };
+ my $bits = 8;
if (not is_little_endian()) {
print "Forcing unit size of 8 on non-little-endian systems.\n";
} else {
print "Checking unit size in bits... ";
+ my $size = 1;
my $align = $Config{alignbytes} || 1;
- my @bits = (8, 16, 32, 64);
- for my $bits (@bits) {
- my $size = $Config{"u${bits}size"};
- next unless $size;
- $unit = { bits => $bits, size => $size } if $size && $size <= $align;
+ my @units = (8, 16, 32, 64);
+ for my $unit (@units) {
+ my $unit_size = $Config{"u${unit}size"};
+ if ($unit_size and $unit_size <= $align) {
+ $bits = $unit;
+ $size = $unit_size;
+ }
}
- print $unit->{bits},
- " (actually $unit->{size} bytes for $align bytes alignment).\n";
+ print "$bits (actually $size bytes for $align bytes alignment).\n";
}
-
- my $bits = $unit->{bits};
push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"';
push @DEFINES, "-DSVU_SIZE=$bits";
} else {