Skip reg_eval_scope.t under minitest, as it needs charnames.

[perl5.git] / win32 / config_sh.PL

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index a30dfcf..2c319b5 100644 (file)
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -42,8 +42,9 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) {
     shift(@{$optref});
 }
 
+FindExt::scan_ext("../cpan");
+FindExt::scan_ext("../dist");
 FindExt::scan_ext("../ext");
-FindExt::scan_ext("ext") if -d 'ext';  # also look in win32/ext/ if it exists
 FindExt::set_static_extensions(split ' ', $opt{'static_ext'});
 
 $opt{'nonxs_ext'}        = join(' ',FindExt::nonxs_ext()) || ' ';
@@ -98,8 +99,8 @@ if (exists $opt{cc}) {
         my $output = `bcc32 --version 2>&1`;
         $opt{ccversion} = $output =~ /([\d.]+)/ ? $1 : '?';
     }
-    elsif ($opt{cc} eq 'gcc') {
-        chomp($opt{gccversion} = `gcc -dumpversion`);
+    elsif ($opt{cc} =~ /\bgcc\b/) {
+        chomp($opt{gccversion} = `$opt{cc} -dumpversion`);
     }
 }
 
@@ -126,7 +127,7 @@ if ($opt{uselargefiles} eq 'define' and $opt{cc} ne 'bcc32') {
     if ($opt{cc} eq 'cl') {
        $opt{lseektype} = '__int64';
     }
-    elsif ($opt{cc} eq 'gcc') {
+    elsif ($opt{cc} =~ /\bgcc\b/) {
        $opt{lseektype} = 'long long';
     }
 }
@@ -136,12 +137,7 @@ if ($opt{uselargefiles} eq 'define' and $opt{cc} ne 'bcc32') {
 # at least the range of that).
 if ($opt{cc} eq 'cl' and $opt{ccversion} =~ /^(\d+)/) {
     my $ccversion = $1;
-    if ($ccversion == 14) {
-       $opt{sGMTIME_max} = 32535244799;
-       $opt{sLOCALTIME_max} = 32535244799;
-    }
-    elsif ($ccversion >= 15) {
-       $opt{sGMTIME_min} = -43200;
+    if ($ccversion >= 14) {
        $opt{sGMTIME_max} = 32535291599;
        $opt{sLOCALTIME_max} = 32535244799;
     }