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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Dec 27 15:11:00 UTC 2018


 configure.ac |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 5d7444c01aab5713b5f67f158624d7ce8180b3c1
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Dec 27 14:40:32 2018 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Dec 27 16:10:34 2018 +0100

    Two branches are identical
    
    Change-Id: I122ff47df8c91f9a526c6bc0842598108a2cb9a7
    Reviewed-on: https://gerrit.libreoffice.org/65642
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/configure.ac b/configure.ac
index 29252ec28f81..b2651e3f1aca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3475,14 +3475,8 @@ if test "$_os" = "WINNT"; then
     dnl Save the true MSVC cl.exe for use when CC/CXX is actually clang-cl,
     dnl needed when building CLR code:
     if test -z "$MSVC_CXX"; then
-        if test "$BITNESS_OVERRIDE" = ""; then
-            if test -f "$VC_PRODUCT_DIR/$CL_DIR/cl.exe"; then
-                MSVC_CXX="$VC_PRODUCT_DIR/$CL_DIR/cl.exe"
-            fi
-        else
-            if test -f "$VC_PRODUCT_DIR/$CL_DIR/cl.exe"; then
-                MSVC_CXX="$VC_PRODUCT_DIR/$CL_DIR/cl.exe"
-            fi
+        if test -f "$VC_PRODUCT_DIR/$CL_DIR/cl.exe"; then
+            MSVC_CXX="$VC_PRODUCT_DIR/$CL_DIR/cl.exe"
         fi
 
         # This gives us a posix path with 8.3 filename restrictions


More information about the Libreoffice-commits mailing list