From 392f2d64e303cc9a6b6955dfdbde7baea46a6e99 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 8 Oct 2019 15:59:17 +0200
Subject: CXX is now always set before CXX_X64_BINARY on Windows

...since ea3d4e806cbdde18173da92187329f1ac2177e14 "Fix CXX_BASE for clang-cl
builds on Windows", as a side effect, moved the conditional

  CXX=$MSVC_CXX

further up.  This addresses the comment in the commit message of
463a79cbc16c1b4aba1775d7f8ae0324753c322c "CXX_X64_BINARY must be clang-cl not cl
when building with clang-cl":  "Ideally, the code would be reorganized so that
CXX_X64_BINARY is only set after CXX has been set."

Change-Id: Iaa011aeff88669ddd5d33fc5b1109abf02edff54
Reviewed-on: https://gerrit.libreoffice.org/80468
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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