X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Makefile.PL;h=cd341adbc211100fb67adc5a76c495445783d4a0;hb=a0fe58c410ccb7c3ebab821267cdafb5c561e316;hp=846e489b82688f75755b1c758e242488c6c03817;hpb=b1a1df91b1e35312c5b2e18b7b780c6525b475be;p=perl%2Fmodules%2FScalar-Vec-Util.git

diff --git a/Makefile.PL b/Makefile.PL
index 846e489..cd341ad 100644
--- 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 {
@@ -111,6 +142,7 @@ if (defined $cc and defined $ld) {
  $PARAMS{C}      = [ ];
  $PARAMS{XS}     = { };
  $PARAMS{OBJECT} = '';
+ print "Falling back to the pure-Perl implementation.\n";
 }
 
 $PARAMS{DEFINE} = join ' ', @DEFINES if @DEFINES;