[svn:ExtUtils-CBuilder] r9405 - in ExtUtils-CBuilder/trunk: . lib/ExtUtils/CBuilder/Platform

[kwilliams]

Author: kwilliams
Date: Fri Apr 13 05:34:10 2007
New Revision: 9405

Modified:
   ExtUtils-CBuilder/trunk/Changes
   ExtUtils-CBuilder/trunk/lib/ExtUtils/CBuilder/Platform/Windows.pm

Log:
apply bleadperl #30943

Modified: ExtUtils-CBuilder/trunk/Changes
==============================================================================
--- ExtUtils-CBuilder/trunk/Changes     (original)
+++ ExtUtils-CBuilder/trunk/Changes     Fri Apr 13 05:34:10 2007
@@ -1,5 +1,8 @@
 Revision history for Perl extension ExtUtils::CBuilder.
 
+ - Fixed a part of the manifest thingy that got broken on 64-bit
+   Windows platforms in version 0.18. [Steve Hay, Jan Dubois]
+
 0.18 - Mon Mar 26 21:29:09 2007
 
  - Various OS/2 fixes:

Modified: ExtUtils-CBuilder/trunk/lib/ExtUtils/CBuilder/Platform/Windows.pm
==============================================================================
--- ExtUtils-CBuilder/trunk/lib/ExtUtils/CBuilder/Platform/Windows.pm   
(original)
+++ ExtUtils-CBuilder/trunk/lib/ExtUtils/CBuilder/Platform/Windows.pm   Fri Apr 
13 05:34:10 2007
@@ -374,8 +374,8 @@
     $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"
     ];