diff options
| author | Jan Dubois <jand@activestate.com> | 2007-04-09 10:27:17 -0700 |
|---|---|---|
| committer | Steve Peters <steve@fisharerojo.org> | 2007-04-10 02:30:38 +0000 |
| commit | 58d049f00f60aef7f74b8009451ce6d3c97fbf6b (patch) | |
| tree | 32635e59c20504ce693b2a60840088bf7f401145 /lib/ExtUtils | |
| parent | bce280147cab576cf18d8ed362df18f471c16952 (diff) | |
| download | perl-58d049f00f60aef7f74b8009451ce6d3c97fbf6b.tar.gz | |
Restore Win64 compilation with the Windows Platform SDK
Message-ID: <4kll13df3tndn8alp54gi9ur9jmq063aij@4ax.com>
p4raw-id: //depot/perl@30878
Diffstat (limited to 'lib/ExtUtils')
| -rw-r--r-- | lib/ExtUtils/MM_Win32.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index 95264a0a52..75d01cac3b 100644 --- a/lib/ExtUtils/MM_Win32.pm +++ b/lib/ExtUtils/MM_Win32.pm @@ -29,7 +29,7 @@ use vars qw(@ISA $VERSION); require ExtUtils::MM_Any; require ExtUtils::MM_Unix; @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -$VERSION = '1.14'; +$VERSION = '1.14_01'; $ENV{EMXSHELL} = 'sh'; # to run `commands` @@ -341,7 +341,8 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). push(@m, q{ $(LD) -out:$@ $(LDDLFLAGS) }.$ldfrom.q{ $(OTHERLDFLAGS) } .q{$(MYEXTLIB) $(PERL_ARCHIVE) $(LDLOADLIBS) -def:$(EXPORT_LIST)}); - if ($Config{cc} eq 'cl' and $Config{ccversion} =~ /^(\d+)/ and $1 >= 14) { # VC 2005 (aka VC 8) or higher + # VS2005 (aka VC 8) or higher, but not for 64-bit compiler from Platform SDK + if ($Config{ivsize} == 4 && $Config{cc} eq 'cl' and $Config{ccversion} =~ /^(\d+)/ and $1 >= 14) { push(@m, q{ mt -nologo -manifest $@.manifest -outputresource:$@;2 && del $@.manifest}); |