Also remove PP in @ARGV when PP=0

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

diff --git a/Makefile.PL b/Makefile.PL
index cd341adbc211100fb67adc5a76c495445783d4a0..ac429aaa05c6765ea0aa33b06c9d6c30229a31ce 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -72,22 +72,21 @@ sub check_exe {
  return $exe;
 }
 
-my ($pp, $skip_arg);
+my $pp;
 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;
+   $pp = 1;
    last;
   }
+  $ARGV[$i] = undef;
  }
 }
-if (defined $skip_arg) {
- splice @ARGV, $skip_arg, 1;
-}
+
+@ARGV = grep defined, @ARGV;
 
 my ($cc, $ld);
 unless ($pp) {
@@ -119,23 +118,23 @@ 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 {