Auto merge of #28340 - brson:configure, r=alexcrichton
Redirect stdout on the python bogosity detector. This is printing pwd to the terminal currently. Reformat the bogus python/cmake messages so they format correctly. echo does not always escape newlines (it doesn't here), and multiline strings don't whitespace munch. r? @alexcrichton
This commit is contained in:
commit
d89a10b0a6
|
@ -1191,12 +1191,21 @@ do
|
||||||
#
|
#
|
||||||
# Consequently here we try to detect when that happens and print an
|
# Consequently here we try to detect when that happens and print an
|
||||||
# error if it does.
|
# error if it does.
|
||||||
if $CFG_PYTHON -c 'import sys; print sys.argv[1]' `pwd` | grep '^/'
|
if $CFG_PYTHON -c 'import sys; print sys.argv[1]' `pwd` | grep '^/' > /dev/null
|
||||||
then
|
then
|
||||||
err "python is silently translating windows paths to MSYS paths \
|
err "
|
||||||
and the build will fail if this python is used.\n\n \
|
|
||||||
Either an official python install must be used or an \
|
python is silently translating windows paths to MSYS paths \
|
||||||
alternative python package in MinGW must be used."
|
and the build will fail if this python is used.
|
||||||
|
|
||||||
|
Either an official python install must be used or an \
|
||||||
|
alternative python package in MinGW must be used.
|
||||||
|
|
||||||
|
If you are building under msys2 try installing the mingw-w64-x86_64-python2 \
|
||||||
|
package instead of python2:
|
||||||
|
|
||||||
|
$ pacman -R python2 && pacman -S mingw-w64-x86_64-python2
|
||||||
|
"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# MSVC requires cmake because that's how we're going to build LLVM
|
# MSVC requires cmake because that's how we're going to build LLVM
|
||||||
|
@ -1207,10 +1216,19 @@ do
|
||||||
# detect that here and error.
|
# detect that here and error.
|
||||||
if ! "$CFG_CMAKE" --help | sed -n '/^Generators/,$p' | grep 'Visual Studio' > /dev/null
|
if ! "$CFG_CMAKE" --help | sed -n '/^Generators/,$p' | grep 'Visual Studio' > /dev/null
|
||||||
then
|
then
|
||||||
err "cmake does not support Visual Studio generators.\n\n \
|
err "
|
||||||
This is likely due to it being an msys/cygwin build of cmake, \
|
|
||||||
rather than the required windows version, built using MinGW \
|
cmake does not support Visual Studio generators.
|
||||||
or Visual Studio."
|
|
||||||
|
This is likely due to it being an msys/cygwin build of cmake, \
|
||||||
|
rather than the required windows version, built using MinGW \
|
||||||
|
or Visual Studio.
|
||||||
|
|
||||||
|
If you are building under msys2 try installing the mingw-w64-x86_64-cmake \
|
||||||
|
package instead of cmake:
|
||||||
|
|
||||||
|
$ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake
|
||||||
|
"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Use the REG program to figure out where VS is installed
|
# Use the REG program to figure out where VS is installed
|
||||||
|
|
Loading…
Reference in New Issue