Update VPIT::TestHelpers to 15e8aee3

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

diff --git a/Makefile.PL b/Makefile.PL
index 49e3969ceef0de4cf502d38bc9823d22c61c382a..0a96f8793cf8fc870742a0f5da0a24663a877945 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -42,7 +42,12 @@ sub validate_exe {
 }
 
 sub check_exe {
- my ($desc, $arg_var, $config_var, $env_var, $preferred_path) = @_;
+ 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;
 
@@ -57,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}, $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}, $preferred_path);
+  for my $try (@$tries) {
+   next unless defined $try;
+   $exe = validate_exe($try, $preferred_path);
+   last if defined $exe;
   }
   if (defined $exe) {
    print "$exe\n";
@@ -101,11 +106,20 @@ my $pp = filter_argv PP => sub {
 if ($pp) {
  print "Forcing the pure-Perl implementation from the arguments passed to Makefile.PL.\n";
 } else {
- $cc = check_exe('C compiler', 'CC', 'cc', 'CC');
+ $cc = check_exe(
+  desc    => 'C compiler',
+  arg_var => 'CC',
+  try     => [ $Config{cc}, $ENV{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);
+  $ld = check_exe(
+   desc           => 'linker',
+   arg_var        => 'LD',
+   try            => [ $Config{ld}, $ENV{LD}, 'ld' ],
+   preferred_path => $preferred_path,
+  );
  }
 }
 
@@ -129,25 +143,31 @@ if (defined $cc and defined $ld) {
  $PARAMS{CC} = $cc;
  $PARAMS{LD} = $ld;
 
- my $bits = 8;
- 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 $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;
+  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 "$bits (actually $size bytes for $align bytes alignment).\n";
+  push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"';
+  push @DEFINES, "-DSVU_SIZE=$bits";
  }
- push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"';
- push @DEFINES, "-DSVU_SIZE=$bits";
 } else {
  $PARAMS{C}      = [ ];
  $PARAMS{XS}     = { };