From: Jan Dubois <jand@activestate.com>
Date: Tue, 10 Apr 2007 16:49:21 +0000 (-0700)
Subject: RE: [PATCH] Restore Win64 compilation with the Windows Platform SDK
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f6397ea565c44d76cd48e3d5144d33d48765d118;p=p5sagit%2Fp5-mst-13.2.git

RE: [PATCH] Restore Win64 compilation with the Windows Platform SDK
From: "Jan Dubois" <jand@activestate.com>
Message-ID: <001b01c77bca$dcae7720$960b6560$@com>

p4raw-id: //depot/perl@30943
---

diff --git a/lib/ExtUtils/CBuilder/Platform/Windows.pm b/lib/ExtUtils/CBuilder/Platform/Windows.pm
index 1523221..036d056 100644
--- a/lib/ExtUtils/CBuilder/Platform/Windows.pm
+++ b/lib/ExtUtils/CBuilder/Platform/Windows.pm
@@ -374,8 +374,8 @@ sub format_linker_cmd {
     $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"
     ];