[Python-checkins] cpython (3.5): Issue 24385: Adds "--as-flags=--32" when generating 32-bit MinGW library.

[steve.dower]

https://hg.python.org/cpython/rev/e4cde2f928fe
changeset:   96547:e4cde2f928fe
branch:      3.5
parent:      96545:0a1f1988fece
user:        Steve Dower <steve.dower at microsoft.com>
date:        Mon Jun 08 09:55:43 2015 -0700
summary:
  Issue 24385: Adds "--as-flags=--32" when generating 32-bit MinGW library.

files:
  Tools/msi/dev/dev.wixproj |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Tools/msi/dev/dev.wixproj b/Tools/msi/dev/dev.wixproj
--- a/Tools/msi/dev/dev.wixproj
+++ b/Tools/msi/dev/dev.wixproj
@@ -37,12 +37,12 @@
             Condition="$(BuildForRelease)">
         <!-- Build libpython##.a as part of this project. This requires gendef and dlltool on the path. -->
         <PropertyGroup>
-            <_GenDefPlatform>i386</_GenDefPlatform>
-            <_GenDefPlatform Condition="$(Platform) == 'x64'">i386:x86-64</_GenDefPlatform>
+            <_DllToolOpts>-m i386 --as-flags=--32</_DllToolOpts>
+            <_DllToolOpts Condition="$(Platform) == 'x64'">-m i386:x86-64</_DllToolOpts>
         </PropertyGroup>
 
         <Exec Command='gendef - "$(BuildPath)$(PyDllName).dll" > "$(IntermediateOutputPath)mingwlib.def"' ContinueOnError="false" />
-        <Exec Command='dlltool --dllname $(PyDllName).dll --def "$(IntermediateOutputPath)mingwlib.def" --output-lib "$(BuildPath)lib$(PyDllName).a" -m $(_GenDefPlatform)' />
+        <Exec Command='dlltool --dllname $(PyDllName).dll --def "$(IntermediateOutputPath)mingwlib.def" --output-lib "$(BuildPath)lib$(PyDllName).a" $(_DllToolOpts)' />
     </Target>
 
     <Import Project="..\msi.targets" />

-- 
Repository URL: https://hg.python.org/cpython