rollup merge of #17281 : saysjonathan/missing-semicolon

This commit is contained in:
Alex Crichton 2014-09-17 08:49:12 -07:00
commit 6f575d1b9c

2
configure vendored
View file

@ -636,7 +636,7 @@ then
# check that gcc, cc and g++ all point to the same compiler.
# note that for xcode 5, g++ points to clang, not clang++
if !((chk_cc gcc clang && chk_cc g++ clang) ||
(chk_cc gcc gcc &&( chk_cc g++ g++ || chk g++ gcc))) then
(chk_cc gcc gcc &&( chk_cc g++ g++ || chk g++ gcc))); then
err "the gcc and g++ in your path point to different compilers.
Check which versions are in your path with gcc --version and g++ --version.
To resolve this problem, either fix your PATH or run configure with --enable-clang"