Use tools for proper architecture for both x64 and x86 builds

Desktop / LibreOffice - Mike Kaganski [collabora.com] - 2 July 2019 01:06 EDT

This allows to use 64-bit tools on x64 hosts for all modules, both 32- and 64-bit, and so avoid memory problems, like in https://ci.libreoffice.org/job/gerrit_windows/39174/console

LINK : the 32-bit linker (C:\PROGRA~2\MIB055~1\2017\COMMUN~1\VC\Tools\MSVC\1414~1.264\bin\HostX86\x86\link.exe) failed to do memory mapped file I/O on `out\zlib.lib' and is going to restart linking with a 64-bit linker for better throughput LINK : restarting link with 64-bit linker `C:/cygwin/bin\link.exe'

where it then picks wrong linker, failing the build.

Also, it theoretically allows using 32-bit tools when building on 32-bit host, and build both 32- and 64-bit modules (no idea if it is actually possible though).

Removed checks for tools locations from older VS versions.

Change-Id: I4798a1c66df580027243ca8c7b4d375148214984

81ab6abe574a Use tools for proper architecture for both x64 and x86 builds
configure.ac | 82 ++++++++++++++++++++++++------------------------------------
1 file changed, 32 insertions(+), 50 deletions(-)

Upstream: cgit.freedesktop.org


  • Share