diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-04-23 10:44:53 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-26 14:02:52 +0200 |
| commit | 9bd93466e47c3a472b273f3846169afbdf063885 (patch) | |
| tree | f914b976f14d3d0e16313bda407a30b5d70ceebf | |
| parent | 649314399483331244538128149ebd0556166540 (diff) | |
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+LibreOffice@googlemail.com>
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 90cbfb33f9e2..48faa25c4acc 100644 --- a/configure.ac +++ b/configure.ac @@ -15296,6 +15296,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 @@ -15426,8 +15429,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 |