summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-12-27 14:40:32 +0100
committerMike Kaganski <mike.kaganski@collabora.com>2018-12-27 16:10:34 +0100
commit5d7444c01aab5713b5f67f158624d7ce8180b3c1 (patch)
treed9c48a8cf06aadf152a8841eb25fa93931748d1d /configure.ac
parenttdf#107792 vcl/win/gdi: introduce ScopedHBRUSH (diff)
downloadcore-5d7444c01aab5713b5f67f158624d7ce8180b3c1.tar.gz
core-5d7444c01aab5713b5f67f158624d7ce8180b3c1.zip
Two branches are identical
Change-Id: I122ff47df8c91f9a526c6bc0842598108a2cb9a7 Reviewed-on: https://gerrit.libreoffice.org/65642 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac10
1 files changed, 2 insertions, 8 deletions
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