X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FScalar-Vec-Util.git;a=blobdiff_plain;f=Makefile.PL;h=0a96f8793cf8fc870742a0f5da0a24663a877945;hp=1af2ae870c9cb66f18790ff2bfd16ba9dc5835b9;hb=HEAD;hpb=f04b35b97b754cddb0e780e41cf4be57a65963b8

diff --git a/Makefile.PL b/Makefile.PL
index 1af2ae8..0a96f87 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,15 +8,22 @@ 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;
-  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);
@@ -35,13 +42,18 @@ sub validate_exe {
 }
 
 sub check_exe {
- my ($desc, $arg_var, $config_var, $env_var) = @_;
+ my (%args) = @_;
+
+ my $desc           = delete $args{desc};
+ my $arg_var        = delete $args{arg_var};
+ my $tries          = delete $args{try};
+ my $preferred_path = delete $args{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;
   }
  }
@@ -50,10 +62,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});
-  # 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});
+  for my $try (@$tries) {
+   next unless defined $try;
+   $exe = validate_exe($try, $preferred_path);
+   last if defined $exe;
   }
   if (defined $exe) {
    print "$exe\n";
@@ -65,28 +77,49 @@ sub check_exe {
  return $exe;
 }
 
-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;
+sub filter_argv {
+ my ($var, $code) = @_;
+
+ my $ret;
+
+ for my $i (0 .. $#ARGV) {
+  my $arg = $ARGV[$i];
+  if ($arg =~ /^\Q$var\E=(.*)/) {
+   my $val = $1;
+   $ret = $code->($val);
+   $ARGV[$i] = undef;
+   last if $ret;
   }
  }
-}
-if (defined $skip_arg) {
- splice @ARGV, $skip_arg, 1;
+
+ @ARGV = grep defined, @ARGV;
+
+ return $ret;
 }
 
 my ($cc, $ld);
-unless ($pp) {
- $cc = check_exe('C compiler', 'CC', 'cc', 'CC');
+my $pp = filter_argv PP => sub {
+ my ($val) = @_;
+ return (do { no warnings 'numeric'; int $val } or $val =~ /^(?:y|yes)$/i)
+        ? 1 : 0;
+};
+if ($pp) {
+ print "Forcing the pure-Perl implementation from the arguments passed to Makefile.PL.\n";
+} else {
+ $cc = check_exe(
+  desc    => 'C compiler',
+  arg_var => 'CC',
+  try     => [ $Config{cc}, $ENV{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(
+   desc           => 'linker',
+   arg_var        => 'LD',
+   try            => [ $Config{ld}, $ENV{LD}, 'ld' ],
+   preferred_path => $preferred_path,
+  );
  }
 }
 
@@ -110,25 +143,31 @@ if (defined $cc and defined $ld) {
  $PARAMS{CC} = $cc;
  $PARAMS{LD} = $ld;
 
- my $unit = { bits => 8, size => 1 };
- if (not is_little_endian()) {
-  print "Forcing unit size of 8 on non-little-endian systems.\n";
+ my $type = filter_argv UNIT => sub { return $_[0] };
+ if (defined $type) {
+  print "Forcing '$type' as the unit.\n";
+  push @DEFINES, '-DBV_UNIT="' . $type . '"';
  } else {
-  print "Checking unit size in bits... ";
-  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 $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 @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 "$bits (actually $size bytes for $align bytes alignment).\n";
   }
-  print $unit->{bits},
-                " (actually $unit->{size} bytes for $align bytes alignment).\n";
+  push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"';
+  push @DEFINES, "-DSVU_SIZE=$bits";
  }
-
- my $bits = $unit->{bits};
- push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"';
- push @DEFINES, "-DSVU_SIZE=$bits";
 } else {
  $PARAMS{C}      = [ ];
  $PARAMS{XS}     = { };