diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-06-08 16:55:43 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-06-08 16:55:43 (GMT) |
| commit | 9901856ac465a55ffbbfa83cb64741a6230b5266 (patch) | |
| tree | 64b128edb3a07a39efcb865391da5cf343021c04 /Tools | |
| parent | 23e6109112ed59fb1e29679949a7b68f082517ae (diff) | |
| download | cpython-9901856ac465a55ffbbfa83cb64741a6230b5266.zip cpython-9901856ac465a55ffbbfa83cb64741a6230b5266.tar.gz cpython-9901856ac465a55ffbbfa83cb64741a6230b5266.tar.bz2 | |
Issue 24385: Adds "--as-flags=--32" when generating 32-bit MinGW library.
Diffstat (limited to 'Tools')
| -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 e144878..682b660 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" /> |