diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-07-08 14:37:52 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-07-08 16:18:17 +0200 |
| commit | b55031ec4e15b085a6eca581a46f229187c93afa (patch) | |
| tree | 488f93ca2e91aff38be15e67dde7f6971f65892c | |
| parent | baaaee9b1665245e5b4f6a0ef5c949fd3ab32862 (diff) | |
Avoid "ECHO is off." output when requested variable consists of spaces
Change-Id: I41e298ee3ea8d6c1cd249e8ee5f0ced997255ec3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98369
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index ba23b7211e27..f5463c5c0731 100644 --- a/configure.ac +++ b/configure.ac @@ -3416,7 +3416,8 @@ win_get_env_from_vsvars32bat() # Also seems to be located in another directory under the same name: vsvars32.bat # https://github.com/bazelbuild/bazel/blob/master/src/main/native/build_windows_jni.sh#L56-L57 printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo\r\n' "$(cygpath -w $VC_PRODUCT_DIR)" > $WRAPPERBATCHFILEPATH - printf '@setlocal\r\n@echo %%%s%%\r\n@endlocal\r\n' "$1" >> $WRAPPERBATCHFILEPATH + # use 'echo.%ENV%' syntax (instead of 'echo %ENV%') to avoid outputting "ECHO is off." in case when ENV is empty or a space + printf '@setlocal\r\n@echo.%%%s%%\r\n@endlocal\r\n' "$1" >> $WRAPPERBATCHFILEPATH chmod +x $WRAPPERBATCHFILEPATH _win_get_env_from_vsvars32bat=$("$WRAPPERBATCHFILEPATH" | tr -d '\r') rm -f $WRAPPERBATCHFILEPATH |