diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-06-08 09:55:43 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-06-08 09:55:43 -0700 |
| commit | a6ea14d08c4db242141bed81258cc9bb65fe8a5b (patch) | |
| tree | e3a2319507beed1a15b7a288b5a46cb018108132 /Tools/msi/dev | |
| parent | 1274a8441ab5e1118d10308d7183d86cd8e59bf9 (diff) | |
| download | cpython-a6ea14d08c4db242141bed81258cc9bb65fe8a5b.tar.gz | |
Issue 24385: Adds "--as-flags=--32" when generating 32-bit MinGW library.
Diffstat (limited to 'Tools/msi/dev')
| -rw-r--r-- | 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 index e144878a53..682b66031f 100644 --- 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" /> |