Clean up unit discovery

[perl/modules/Scalar-Vec-Util.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 846e489b82688f75755b1c758e242488c6c03817..c56d8b54c77d885ecf2bf1a12cd9dd06310b55a1 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,15 +8,26 @@ use Config;
 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;
-  @candidates = map File::Spec->catfile($_, $base), 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);
+  }
  }
 
  for my $path (@candidates) {
@@ -31,13 +42,13 @@ sub validate_exe {
 }
 
 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;
   }
  }
@@ -46,10 +57,10 @@ sub check_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";
@@ -61,11 +72,31 @@ sub check_exe {
  return $exe;
 }
 
-my $cc = check_exe('C compiler', 'CC', 'cc', 'CC');
+my ($pp, $skip_arg);
+for my $i (0 .. $#ARGV) {
+ my $arg = $ARGV[$i];
+ if ($arg =~ /^PP=(.*)/) {
+  my $val = $1;
+  if (do { no warnings 'numeric'; int $val } or $val =~ /^(?:y|yes)$/i) {
+   print "Forcing the pure-Perl implementation from the arguments passed to Makefile.PL.\n";
+   $pp       = 1;
+   $skip_arg = $i;
+   last;
+  }
+ }
+}
+if (defined $skip_arg) {
+ splice @ARGV, $skip_arg, 1;
+}
 
-my $ld;
-if (defined $cc) {
- $ld = check_exe('linker', 'LD', 'ld', 'LD');
+my ($cc, $ld);
+unless ($pp) {
+ $cc = check_exe('C compiler', 'CC', 'cc', 'CC');
+ if (defined $cc) {
+  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);
+ }
 }
 
 sub is_little_endian {
@@ -88,29 +119,30 @@ if (defined $cc and defined $ld) {
  $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 {
  $PARAMS{C}      = [ ];
  $PARAMS{XS}     = { };
  $PARAMS{OBJECT} = '';
+ print "Falling back to the pure-Perl implementation.\n";
 }
 
 $PARAMS{DEFINE} = join ' ', @DEFINES if @DEFINES;