X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Makefile.PL;h=f91e00fb59d78923400d66af7f22993bf7588b40;hb=23c7f5b6ae98a9f7f1d9ef3384f11eb884a764bd;hp=4ab4e0325464785501443a9be0acfa0d8d66bfe7;hpb=f954475502b63b7c2c7a95f3698ba1d1b0654972;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/Makefile.PL b/Makefile.PL
index 4ab4e03..f91e00f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,19 +23,28 @@ if ($^O eq 'MSWin32' and not grep /^LD[A-Z]*=/, @ARGV) {
                   @Config{qw<bin sitebin>};
   $macro{LDDLFLAGS}    = "$lddlflags $libdirs $libperl";
   $macro{LDFLAGS}      = "$ldflags $libdirs $libperl";
-  $macro{PERL_ARCHIVE} = '',
+  eval <<'  MY_SECTION';
+   package MY;
+   sub dynamic_lib {
+    my $self = shift;
+    my $inherited = $self->SUPER::dynamic_lib(@_);
+    $inherited =~ s/"?\$\(PERL_ARCHIVE\)"?//g;
+    return $inherited;
+   }
+  MY_SECTION
+  die $@ if $@;
  }
 }
 print $is_gcc_34 ? "yes\n" : "no\n";
 
 # Threads, Windows and 5.8.x don't seem to be best friends
 if ($^O eq 'MSWin32' && "$]" < 5.009) {
- push @DEFINES, '-DLT_MULTIPLICITY=0';
+ push @DEFINES, '-DXSH_MULTIPLICITY=0';
 }
 
 # Fork emulation got "fixed" in 5.10.1
 if ($^O eq 'MSWin32' && "$]" < 5.010_001) {
- push @DEFINES, '-DLT_FORKSAFE=0';
+ push @DEFINES, '-DXSH_FORKSAFE=0';
 }
 
 @DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES;