summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2017-03-09 17:11:28 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2017-03-09 17:35:53 +0100
commit019ea173701eae4b8c5ffd45bb0063fc0a688ce0 (patch)
tree01cf457794a90c9211004cd9fe44da071b691fb5 /configure.ac
parent25a5458e751f34063686c4fecd7b8bfc8a78302d (diff)
Just get rid of CR when parsing .bat output
Converts Windows to Unix newlines, so bash will handle the result correctly. Since $(..) or `..` will already remove trailing newlines, this reverts the unneeded changes of commit 37baabe6436037de604bfbc2702bfb0bc156c41b Change-Id: I0071237f0600c2d71da066eb2e2b541e338e7016
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index dc837c55c487..c970c3990507 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3313,9 +3313,9 @@ win_get_env_from_vsvars32bat()
echo -e "@echo %$1%\r\n" >> $WRAPPERBATCHFILEPATH
echo -e "@endlocal\r\n" >> $WRAPPERBATCHFILEPATH
chmod +x $WRAPPERBATCHFILEPATH
- _win_get_env_from_vsvars32bat=$($WRAPPERBATCHFILEPATH | tr -d "\n\r\0")
+ _win_get_env_from_vsvars32bat=$($WRAPPERBATCHFILEPATH | tr -d "\r")
rm -f $WRAPPERBATCHFILEPATH
- echo -n $_win_get_env_from_vsvars32bat
+ echo $_win_get_env_from_vsvars32bat
}
find_ucrt()