[Libreoffice-commits] core.git: configure.ac

[Mike Kaganski (via logerrit)]

 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b55031ec4e15b085a6eca581a46f229187c93afa
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Jul 8 14:37:52 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Jul 8 16:18:17 2020 +0200

    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 at collabora.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

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 at echo %%%s%%\r\n at 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 at echo.%%%s%%\r\n at endlocal\r\n' "$1" >> $WRAPPERBATCHFILEPATH
     chmod +x $WRAPPERBATCHFILEPATH
     _win_get_env_from_vsvars32bat=$("$WRAPPERBATCHFILEPATH" | tr -d '\r')
     rm -f $WRAPPERBATCHFILEPATH