Revamp compiler/linker discovery in Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 4ee7ab16677c357b5ac090f10fd3220f2584898a..846e489b82688f75755b1c758e242488c6c03817 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,44 +5,68 @@ use warnings;
 use ExtUtils::MakeMaker;
 
 use Config;
+use File::Spec;
+
+sub validate_exe {
+ my ($name) = @_;
+
+ 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 $base, @args) = split ' ', $name;
+  @candidates = map File::Spec->catfile($_, $base), File::Spec->path;
+ }
+
+ for my $path (@candidates) {
+  my $command = MM->maybe_command($path);
+  if (defined $command) {
+   $command .= " @args" if @args;
+   return $command;
+  }
+ }
 
-BEGIN {
- local $@;
- eval { require File::Spec; 1 } or die 'OS unsupported';
+ return;
 }
 
-my $cc;
-for (@ARGV) {
- if (/^CC=(.*)/) {
-  $cc = $1;
-  last;
+sub check_exe {
+ my ($desc, $arg_var, $config_var, $env_var) = @_;
+
+ my $exe;
+
+ for (@ARGV) {
+  if (/^\Q$arg_var\E=(.*)/) {
+   $exe = validate_exe($1);
+   last if defined $exe;
+  }
  }
-}
-if (defined $cc) {
- print "Forcing the use of $cc as the C compiler.\n";
-} else {
- # Inspired from Module::Install::Can
- print "Checking for a valid C compiler in the PATH... ";
- my @ccs = ($Config{cc});
- unshift @ccs, $ENV{CC} if $ENV{CC};
-CC:
- for my $c (@ccs) {
-  for my $dir (split /$Config{path_sep}/, $ENV{PATH}) {
-   my $abs = File::Spec->catfile($dir, $c);
-   if (-x $abs or MM->maybe_command($abs)) {
-    $cc = $c;
-    print $cc, "\n";
-    last CC;
-   }
+
+ 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});
+  # 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});
+  }
+  if (defined $exe) {
+   print "$exe\n";
+  } else {
+   print "none\n";
   }
  }
- print "none\n" unless defined $cc;
+
+ return $exe;
 }
 
-my @C;
-push @C, 'Util.c' if defined $cc;
+my $cc = check_exe('C compiler', 'CC', 'cc', 'CC');
 
-my @DEFINES;
+my $ld;
+if (defined $cc) {
+ $ld = check_exe('linker', 'LD', 'ld', 'LD');
+}
 
 sub is_little_endian {
  my $order = $Config{byteorder};
@@ -55,29 +79,41 @@ sub is_little_endian {
  return $order eq (join '', 1 .. $len);
 }
 
-my $unit = { bits => 8, size => 1 };
-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 $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;
- }
- print $unit->{bits},
+my %PARAMS;
+my @DEFINES;
+
+if (defined $cc and defined $ld) {
+ $PARAMS{C}  = [ 'Util.c' ];
+ $PARAMS{XS} = { 'Util.xs' => 'Util.c' };
+ $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";
+ } 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;
+  }
+  print $unit->{bits},
                 " (actually $unit->{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} = '';
 }
 
-@DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES;
+$PARAMS{DEFINE} = join ' ', @DEFINES if @DEFINES;
 
 my $dist = 'Scalar-Vec-Util';
 
@@ -126,8 +162,6 @@ WriteMakefile(
  VERSION_FROM     => $file,
  ABSTRACT_FROM    => $file,
  PL_FILES         => {},
- C                => \@C,
- @DEFINES,
  BUILD_REQUIRES   => \%BUILD_REQUIRES,
  PREREQ_PM        => \%PREREQ_PM,
  MIN_PERL_VERSION => '5.006',
@@ -139,6 +173,7 @@ WriteMakefile(
  clean            => {
   FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt*"
  },
+ %PARAMS,
 );
 
 1;