Set CPPFLAGS instead of the INCLUDE environment variable

INCLUDE is not exported from WSL to Win32 programs without including
it in the list of environment variable names in the WSLENV environment
variable, and I think we want to minimize the number that need to be
mentioned there.

Should not affect Cygwin builds.

Change-Id: I0af480873badac446305e396b69eec360eb8a270
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105098
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Tor Lillqvist
2020-10-31 11:39:46 +01:00
committed by Tor Lillqvist
parent 61e8c19f41
commit 7ca79cfca0
+2 -1
View File
@@ -3967,7 +3967,8 @@ if test "$_os" = "WINNT"; then
# Remove /cl.exe from CC case insensitive
AC_MSG_NOTICE([found Visual C++ $vcyear])
export INCLUDE=`cygpath -d "$COMPATH/Include"`
main_include_dir=`cygpath -d -m "$COMPATH/Include"`
CPPFLAGS="$CPPFLAGS -I$main_include_dir"
PathFormat "$COMPATH"
COMPATH=`win_short_path_for_make "$formatted_path"`