]> granicus.if.org Git - python/commitdiff
Issue 24385: Adds "--as-flags=--32" when generating 32-bit MinGW library.
authorSteve Dower <steve.dower@microsoft.com>
Mon, 8 Jun 2015 16:55:43 +0000 (09:55 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Mon, 8 Jun 2015 16:55:43 +0000 (09:55 -0700)
Tools/msi/dev/dev.wixproj

index e144878a53cad1abca1afbc6220ac146118d7335..682b66031f1e77c029d9bfbc6220a4e94ae09839 100644 (file)
             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" &gt; "$(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" />