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 699cd7d..2c319b5 100644 (file)
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -43,6 +43,7 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) {
 }
 
 FindExt::scan_ext("../cpan");
+FindExt::scan_ext("../dist");
 FindExt::scan_ext("../ext");
 FindExt::set_static_extensions(split ' ', $opt{'static_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';
     }
 }