summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJan Dubois <jand@activestate.com>2007-04-10 09:49:21 -0700
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>2007-04-13 12:14:06 +0000
commitf6397ea565c44d76cd48e3d5144d33d48765d118 (patch)
treedec2b39aeb08a1fc0870050aa42614b2a45c7b7b /lib
parent8b64cefbb0c4938b2bb42e3d9c710d950e00512d (diff)
downloadperl-f6397ea565c44d76cd48e3d5144d33d48765d118.tar.gz
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
Diffstat (limited to 'lib')
-rw-r--r--lib/ExtUtils/CBuilder/Platform/Windows.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ExtUtils/CBuilder/Platform/Windows.pm b/lib/ExtUtils/CBuilder/Platform/Windows.pm
index 1523221ec6..036d056bed 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"
];