This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
RE: [PATCH] Restore Win64 compilation with the Windows Platform SDK
authorJan Dubois <jand@activestate.com>
Tue, 10 Apr 2007 16:49:21 +0000 (09:49 -0700)
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>
Fri, 13 Apr 2007 12:14:06 +0000 (12:14 +0000)
From: "Jan Dubois" <jand@activestate.com>
Message-ID: <001b01c77bca$dcae7720$960b6560$@com>

p4raw-id: //depot/perl@30943

lib/ExtUtils/CBuilder/Platform/Windows.pm

index 1523221..036d056 100644 (file)
@@ -374,8 +374,8 @@ sub format_linker_cmd {
     $spec{output}           ,
   ) ];
 
     $spec{output}           ,
   ) ];
 
-  if ($cf->{cc} eq 'cl' and $cf->{ccversion} =~ /^(\d+)/ and $1 >= 14) {
-    # Embed the manifest file for VC 2005 (aka VC 8) or higher
+  # Embed the manifest file for VC 2005 (aka VC 8) or higher, but not for the 64-bit Platform SDK compiler
+  if ($cf->{ivsize} == 4 && $cf->{cc} eq 'cl' and $cf->{ccversion} =~ /^(\d+)/ and $1 >= 14) {
     push @cmds, [
       'mt', '-nologo', $spec{manifest}, '-outputresource:' . "$output;2"
     ];
     push @cmds, [
       'mt', '-nologo', $spec{manifest}, '-outputresource:' . "$output;2"
     ];