diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-10-09 09:38:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-10-09 10:26:46 +0200 |
| commit | d4876c04fbf0fdb2b153d0d6a7d7b101989d58bb (patch) | |
| tree | f8bc280fa8c0d355d829fc9cfe68bd9eb043ba80 | |
| parent | a9c5c0d814a266096483572b84c72875ef8efd77 (diff) | |
Allow CXX_X86_BINARY to be passed into autogen.sh again
...after 114ed73a7ba56e013e6d7f886798915fb20c0946 "WIN drop --enable-64bit to
select Windows target" had broken a6c22d4e086957b743a135163c71ac233062619e
"Allow CXX_X86_BINARY to be passed into autogen.sh" (and see the commit message
of the latter commit for how this is used by builds with clang-cl)
Change-Id: I7247e41a77d4f65ccae4e0ee522792646068e7b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104101
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6c8ebcd58ebe..7449a78f7962 100644 --- a/configure.ac +++ b/configure.ac @@ -3951,7 +3951,10 @@ if test "$_os" = "WINNT"; then case "$WIN_HOST_ARCH" in x64) AC_MSG_CHECKING([for a x86 compiler and libraries for 32-bit binaries required for TWAIN support]) - if test -n "$WIN_MULTI_ARCH"; then + if test -n "$CXX_X86_BINARY"; then + BUILD_X86=TRUE + AC_MSG_RESULT([preset]) + elif test -n "$WIN_MULTI_ARCH"; then BUILD_X86=TRUE CXX_X86_BINARY=`win_short_path_for_make "$MSVC_MULTI_PATH/cl.exe"` CXX_X86_BINARY+=" /arch:SSE" |