[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann (via logerrit)]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 463a79cbc16c1b4aba1775d7f8ae0324753c322c
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Oct 1 14:09:51 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Oct 1 23:32:10 2019 +0200

    CXX_X64_BINARY must be clang-cl not cl when building with clang-cl
    
    ...to avoid failures like
    
    > [build CXX] shell/source/win32/spsupp/registrar_x64.cxx
    > cl : Command line error D8021 : invalid numeric argument '/Wendif-labels'
    
    after 58ef8c188b6bb2ed307f5e825cc7e475c33d0c33 "Make spsupp*.dll usable on 64-
    bit Windows".
    
    This is a bit of a hack, relying on CXX being passed in via autogen.input in my
    clang-cl build.  Ideally, the code would be reorganized so that CXX_X64_BINARY
    is only set after CXX has been set.
    
    Change-Id: Ia2c823ad6b917218858ea541cc6a65fa423e3a09
    Reviewed-on: https://gerrit.libreoffice.org/79959
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index 30bd03c24123..9de464819664 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3617,7 +3617,7 @@ if test "$_os" = "WINNT"; then
             AC_MSG_WARN([Installation set will not contain 64-bit Explorer extensions])
         fi
     else
-        CXX_X64_BINARY=$MSVC_CXX
+        CXX_X64_BINARY=${CXX:-$MSVC_CXX}
     fi
     AC_SUBST(BUILD_X64)