diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-06-19 10:18:41 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-06-19 10:18:41 +0000 |
| commit | 186e602c1889f6ee5b887f8ac155dcb15661cfa1 (patch) | |
| tree | 4bfd7d72d5dcc917d22c2a5cf2ba7b91c6aeefc6 | |
| parent | ecb2f33519ba533cbb8a58944ee243527071ea13 (diff) | |
| parent | d68db9151d9143821835dfeeb5a616cc23d437d7 (diff) | |
| download | perl-186e602c1889f6ee5b887f8ac155dcb15661cfa1.tar.gz | |
Integrate perlio:
[ 10708]
Get Win32 known_extensions and extensions right in config.sh and hence Config.pm
[ 10678]
Integrate mainline (part2 - the deletes)
p4raw-link: @10708 on //depot/perlio: 1076f1fdb19bacf64e54d08f4a34bbf8042caa24
p4raw-link: @10678 on //depot/perlio: a76697bcbef23e3bb9e08f95279d83f8e0a826a6
p4raw-id: //depot/perl@10710
| -rw-r--r-- | win32/config_sh.PL | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/win32/config_sh.PL b/win32/config_sh.PL index 9757e52cac..35bb6e26e3 100644 --- a/win32/config_sh.PL +++ b/win32/config_sh.PL @@ -44,8 +44,21 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) { shift(@{$optref}); } -$opt{'dynamic_ext'} = join(' ',FindExt::dynamic_extensions()); -$opt{'nonxs_ext'} = join(' ',FindExt::noxs_extensions()); +my @dynamic = FindExt::dynamic_extensions(); +my @noxs = FindExt::noxs_extensions(); +my @known = sort(@dynamic,split(/\s+/,$opt{'staticext'}),@noxs); +$opt{'known_extensions'} = join(' ',@known); + +if (!$opt{'use5005threads'} || $opt{'use5005threads'} eq 'undef') + { + @dynamic = grep(!/Thread/,@dynamic); + @known = grep(!/Thread/,@dynamic); + } + +$opt{'dynamic_ext'} = join(' ',@dynamic); +$opt{'nonxs_ext'} = join(' ',@noxs); + +$opt{'extensions'} = join(' ',@known); my $pl_h = '../patchlevel.h'; |