diff options
| author | MSoegtropIMC <7895506+MSoegtropIMC@users.noreply.github.com> | 2019-07-08 10:00:22 +0200 |
|---|---|---|
| committer | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2019-07-08 10:00:22 +0200 |
| commit | 98858317be25deed815c7a8b5d4e9d6b512f5de5 (patch) | |
| tree | 7d76443aacfedd4e6188aef4c33f52118bdc00ae | |
| parent | 415c5a5a28ac7035cfa33e5753af841a450bfab0 (diff) | |
| download | compcert-98858317be25deed815c7a8b5d4e9d6b512f5de5.tar.gz compcert-98858317be25deed815c7a8b5d4e9d6b512f5de5.zip | |
Make configure resistant to Windows EOL and paths (#305)
Commit 1df887f breaks compilation on some Windows environments,
those where the output of `menhir --suggest-menhirLib` contains `\r\n` end-of-lines
or backslashes in paths. The fix is to filter the output.
Closes: #304 Changes in configure broke Windows build
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -560,7 +560,7 @@ case "$menhir_ver" in 20[0-9][0-9][0-9][0-9][0-9][0-9]) if test "$menhir_ver" -ge $MENHIR_REQUIRED; then echo "version $menhir_ver -- good!" - menhir_include_dir=`menhir --suggest-menhirLib` + menhir_include_dir=$(menhir --suggest-menhirLib | tr -d '\r' | tr '\\' '/') if test -z "$menhir_include_dir"; then echo "Error: cannot determine the location of the Menhir API library." echo "This can be due to an incorrect Menhir package." |