configure.ac | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 703fceba67e0161beca89c0995adc47f7c8d7282
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Apr 23 10:44:53 2024 +0200
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Wed Oct 2 19:43:53 2024 +0200
Honor TMPDIR configure option in WSL_ONLY_AS_HELPER mode
(It needs to be passed-in as a TMPDIR=/mnt/c/... style path, because
configure
uses it early on and otherwise fails with some
> checking build system type... config.guess: cannot create a temporary
directory in C:/...
error.)
Change-Id: I798ed7dd363eb5fd7614c5984861f77cf9d38266
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166506
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174248
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index 1c4a25ca73f8..bec99703c502 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15129,6 +15129,9 @@ AC_SUBST(PERL)
if test -n "$TMPDIR"; then
TEMP_DIRECTORY="$TMPDIR"
+ if test -n "$WSL_ONLY_AS_HELPER"; then
+ TEMP_DIRECTORY=$(wslpath -m "$TEMP_DIRECTORY")
+ fi
else
TEMP_DIRECTORY="/tmp"
fi
@@ -15259,8 +15262,10 @@ if test -n "$WSL_ONLY_AS_HELPER"; then
# append strawberry tools dir to PATH (for e.g. windres, ar)
LO_PATH="$LO_PATH:$STRAWBERRY_TOOLS"
# temp-dir needs to be in windows realm, hardcode for now
- mkdir -p tmp
- TEMP_DIRECTORY="$BUILDDIR/tmp"
+ if test "$TEMP_DIRECTORY" = /tmp; then
+ mkdir -p tmp
+ TEMP_DIRECTORY="$BUILDDIR/tmp"
+ fi
fi
# Keep in sync with list of files far up, at AC_MSG_CHECKING([for
