X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fconfig_sh.PL;h=db4eb56a687441e1918c5233102a30a1881d8bbb;hb=16816334e212c70aca1836b4031924af481891ad;hp=6381cc9a9e58c58ff4b834153e9ac7ac8f0bae23;hpb=2018b34778e5bd6adb24a41e62ec81aa880a20ff;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 6381cc9..db4eb56 100644
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -45,10 +45,12 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) {
 FindExt::scan_ext("../ext");
 FindExt::set_static_extensions(split ' ', $opt{'static_ext'});
 
+my @dynamic_ext = grep(!/Thread/,FindExt::dynamic_ext());
+my @extensions  = grep(!/Thread/,FindExt::extensions());
 $opt{'nonxs_ext'}        = join(' ',FindExt::nonxs_ext()) || ' ';
 $opt{'static_ext'}       = join(' ',FindExt::static_ext()) || ' ';
-$opt{'dynamic_ext'}      = join(' ',FindExt::dynamic_ext()) || ' ';
-$opt{'extensions'}       = join(' ',FindExt::extensions()) || ' ';
+$opt{'dynamic_ext'}      = join(' ',@dynamic_ext) || ' ';
+$opt{'extensions'}       = join(' ',@extensions) || ' ';
 $opt{'known_extensions'} = join(' ',FindExt::known_extensions()) || ' ';
 
 my $pl_h = '../patchlevel.h';
@@ -80,8 +82,7 @@ if (exists $opt{cc}) {
     }
     elsif ($opt{cc} eq 'bcc32') {
         my $output = `bcc32 --version 2>&1`;
-        $opt{ccversion} = $output =~ /(\d+.*)/ ? $1 : '?';
-        $opt{ccversion} =~ s/\s+copyright.*//i;
+        $opt{ccversion} = $output =~ /([\d.]+)/ ? $1 : '?';
     }
     elsif ($opt{cc} eq 'gcc') {
         chomp($opt{gccversion} = `gcc -dumpversion`);