diff options
| author | Yitzchak Scott-Thoennes <sthoenna@efn.org> | 2005-01-05 02:01:41 -0800 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2005-01-06 11:26:12 +0000 |
| commit | ca58f2aeab528ade827eb3d1af8749823f00a279 (patch) | |
| tree | 8336fed6f20c277911dbf278f4eb157e95218825 /win32/config_sh.PL | |
| parent | 03f6ae0019cb1114cbf610f18c001a1250683ef8 (diff) | |
| download | perl-ca58f2aeab528ade827eb3d1af8749823f00a279.tar.gz | |
Fix extensions config fields on Win32 to be as they are on Unix
Subject: [PATCH] Re: lib/Config/Extensions.t fails on Win32
Message-ID: <20050105180141.GA676@efn.org>
p4raw-id: //depot/perl@23757
Diffstat (limited to 'win32/config_sh.PL')
| -rw-r--r-- | win32/config_sh.PL | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/win32/config_sh.PL b/win32/config_sh.PL index 3b76cd04ea..3c144f6954 100644 --- a/win32/config_sh.PL +++ b/win32/config_sh.PL @@ -34,8 +34,6 @@ sub loadopts { } } -FindExt::scan_ext("../ext"); - my %opt; my $optref = loadopts(); @@ -44,18 +42,14 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) { shift(@{$optref}); } -my @dynamic = FindExt::dynamic_extensions(); -my @noxs = FindExt::noxs_extensions(); -my @known = sort(@dynamic,split(/\s+/,$opt{'staticext'}),@noxs); -$opt{'known_extensions'} = join(' ',@known); - -@dynamic = grep(!/Thread/,@dynamic); -@known = grep(!/Thread/,@dynamic); - -$opt{'dynamic_ext'} = join(' ',@dynamic); -$opt{'nonxs_ext'} = join(' ',@noxs); +FindExt::scan_ext("../ext"); +FindExt::set_static_extensions(split ' ', $opt{'static_ext'}); -$opt{'extensions'} = join(' ',@known); +$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{'known_extensions'} = join(' ',FindExt::known_extensions()) || ' '; my $pl_h = '../patchlevel.h'; |