From 3ff41a00aa25922be4cb71a657b124a1c4a8aef7 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 20 Feb 2016 10:30:21 +0100 Subject: Fix UCRT detection Change-Id: If2ef7a8b507e9d65f1f1ee186491ce2f35340362 Reviewed-on: https://gerrit.libreoffice.org/22545 Tested-by: Jenkins Reviewed-by: Norbert Thiebaud --- configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0a200e68c540..f1d8e94fc934 100644 --- a/configure.ac +++ b/configure.ac @@ -3481,13 +3481,14 @@ if test "$_os" = "WINNT"; then if test -n "$ucrttest"; then AC_MSG_RESULT([found]) PathFormat "$ucrttest" - ucrtincpath_formatted="$formatted_path/Include/$ucrtdir/ucrt" + ucrtincpath_formatted="${formatted_path}Include/$ucrtdir/ucrt" # SOLARINC is used for external modules and must be set too. # And no, it's not sufficient to set SOLARINC only, as configure # itself doesn't honour it. SOLARINC="$SOLARINC -I$ucrtincpath_formatted" CFLAGS="$CFLAGS -I$ucrtincpath_formatted" - CXXFLAGS="$CPPFLAGS -I$ucrtincpath_formatted" + CXXFLAGS="$CXXFLAGS -I$ucrtincpath_formatted" + CPPFLAGS="$CPPFLAGS -I$ucrtincpath_formatted" else AC_MSG_ERROR([not found]) fi @@ -12478,7 +12479,7 @@ if test "$build_os" = "cygwin"; then fi if test $VCVER = 140; then PathFormat "$ucrttest" - ucrtlibpath_formatted="$formatted_path/lib/$ucrtdir/ucrt/x64" + ucrtlibpath_formatted="${formatted_path}lib/$ucrtdir/ucrt/x64" ILIB="$ILIB;$ucrtlibpath_formatted" fi else @@ -12492,7 +12493,7 @@ if test "$build_os" = "cygwin"; then fi if test $VCVER = 140; then PathFormat "$ucrttest" - ucrtlibpath_formatted="$formatted_path/lib/$ucrtdir/ucrt/x86" + ucrtlibpath_formatted="${formatted_path}lib/$ucrtdir/ucrt/x86" ILIB="$ILIB;$ucrtlibpath_formatted" fi fi -- cgit