diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-26 13:03:49 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-27 10:16:39 +0200 |
| commit | 9d7548dafb44c1f0af82771a597db1404659af66 (patch) | |
| tree | d17f6ba5413fda06e77d9013f204587bd47c5bf2 | |
| parent | Save with newer Glade version (diff) | |
| download | core-9d7548dafb44c1f0af82771a597db1404659af66.tar.gz core-9d7548dafb44c1f0af82771a597db1404659af66.zip | |
fix some hardcoded use of wsl.exe and fix some typos
Change-Id: I6152ee61913638f828eeb201ecb26312de5f8572
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166737
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
| -rw-r--r-- | config_host.mk.in | 6 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 70d73f0a32f5..3ffe88380180 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -792,8 +792,8 @@ include @SRC_ROOT@/download.lst KEEP_AWAKE_CMD=@KEEP_AWAKE_CMD@ -# prep for WSL-as-helper-builds where build runs from within git-bash/MSYS that would otherwise -# messes with anything that looks like a path (starts with /) but it cannot resolve +# used for WSL-as-helper-builds where the build runs from within git-bash/MSYS that otherwise would +# mess with anything that looks like a path (starts with a /) but cannot be resolved to a target export MSYS_NO_PATHCONV=1 STRAWBERRY_PERL=@STRAWBERRY_PERL@ -WSL=@WSL@
\ No newline at end of file +WSL=@WSL@ diff --git a/configure.ac b/configure.ac index 1650686382ef..e04f4a846642 100644 --- a/configure.ac +++ b/configure.ac @@ -337,7 +337,8 @@ if test -n "$WSL_DISTRO_NAME" && $(echo $PATH |grep -q mingw64); then STRAWBERRY_PERL="$formatted_path/perl/bin/perl.exe" AC_ARG_WITH([wsl-command], [AS_HELP_STRING([--with-wsl-command], - [Specify your wsl distro command if it isn't the default/the one used with just wsl.exe])], + [Specify your wsl distro command if it isn't the default/the one used with just wsl.exe – + for example: wsl.exe -d MyDistro -u NonDefaultUser])], [], [with_wsl_command="wsl.exe"]) WSL="$with_wsl_command" @@ -15468,10 +15469,11 @@ if test -n "$WSL_ONLY_AS_HELPER"; then PERL="perl.exe" # use flex, gperf and nasm from wsl-container # if using absolute path, would need to use double-leading slash for the msys path mangling - FLEX="wsl.exe $FLEX" - NASM="wsl.exe $NASM" - # some externals (libebook) checks with AC_PATH_PROGS, and that requires argument to begin with slash... - GPERF="/c/Windows/system32/wsl.exe gperf" + FLEX="$WSL $FLEX" + NASM="$WSL $NASM" + # some externals (libebook) check for it with AC_PATH_PROGS, and that only accepts overrides + # with an absolute path/requires the value to begin with a slash + GPERF="/c/Windows/system32/$WSL gperf" # 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 |