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

[Stephan Bergmann (via logerrit)]

 configure.ac |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit ea3d4e806cbdde18173da92187329f1ac2177e14
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Oct 8 12:30:20 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Oct 8 15:56:19 2019 +0200

    Fix CXX_BASE for clang-cl builds on Windows
    
    ...where the configure messages confusingly mentioned cl.exe instead of
    clang.exe (but the actual checks correctly used $CXX being clang)
    
    Change-Id: I9e0c6e1ab8ba64c45f752b413c3e6c22182506ac
    Reviewed-on: https://gerrit.libreoffice.org/80442
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index 5d90f3e2d7d6..0943619e7701 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3518,7 +3518,6 @@ if test "$_os" = "WINNT"; then
 
         # This gives us a posix path with 8.3 filename restrictions
         MSVC_CXX=`win_short_path_for_make "$MSVC_CXX"`
-        CXX_BASE=`first_arg_basename "$MSVC_CXX"`
     fi
 
     if test -z "$CC"; then
@@ -3529,6 +3528,10 @@ if test "$_os" = "WINNT"; then
         dnl since MSVC 2012, default for x86 is -arch:SSE2:
         MSVC_CXX="$MSVC_CXX -arch:SSE"
     fi
+    if test -z "$CXX"; then
+        CXX=$MSVC_CXX
+        CXX_BASE=`first_arg_basename "$CXX"`
+    fi
 
     if test -n "$CC"; then
         # Remove /cl.exe from CC case insensitive
@@ -5876,11 +5879,6 @@ if test "$_os" != "WINNT"; then
     if test -z "$CXX_BASE"; then
         CXX_BASE=`first_arg_basename "$CXX"`
     fi
-else
-    if test -n "$CC" -a -z "$CXX"; then
-        CXX="$CC"
-        CXX_BASE="$CC_BASE"
-    fi
 fi
 
 dnl check for GNU C++ compiler version