From: Vincent Pit <vince@profvince.com>
Date: Tue, 24 Mar 2015 19:54:30 +0000 (-0300)
Subject: Update the ActivePerl/gcc-3.4 hack for EUMM 7.04
X-Git-Tag: v0.57~25
X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FVariable-Magic.git;a=commitdiff_plain;h=03134cc40a83015fe9fc077cc903fabb245ea4c8;hp=cf730c379ab00aa65d4ed8f08e2dae34a35e3ffc

Update the ActivePerl/gcc-3.4 hack for EUMM 7.04

Starting from this version, PERL_ARCHIVE is quoted so we can no longer set
it to the empty string. Instead, we remove all occurrences of PERL_ARCHIVE
in the linking step section of the Makefile, which is OK since we specify
the perl DLL in other variables. This new technique is still valid for
older versions of EUMM.
---

diff --git a/Makefile.PL b/Makefile.PL
index 323e83d..aa39d22 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -36,7 +36,16 @@ 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";