Fix overriding CXX setting

If user specifies CXX, use it as-is, since that's the user's choice.

Closes #292
This commit is contained in:
Dan Church 2018-02-04 15:40:31 -06:00 committed by Stephen Anthony
parent 3ab2ddb870
commit 77479cc0dd
1 changed files with 18 additions and 14 deletions

32
configure vendored
View File

@ -348,22 +348,26 @@ esac
# Determine the C++ compiler # Determine the C++ compiler
# #
echo_n "Looking for C++ compiler... " echo_n "Looking for C++ compiler... "
if test -n "$_host"; then if test -n "$CXX"; then
compilers="$CXX $_host_prefix-g++ $_host_prefix-c++ $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++" echo $CXX
else else
compilers="$CXX g++ c++" if test -n "$_host"; then
fi compilers="$_host_prefix-g++ $_host_prefix-c++ $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++"
else
for compiler in $compilers; do compilers="g++ c++"
if test_compiler "$compiler -std=c++14"; then fi
CXX=$compiler
echo $CXX for compiler in $compilers; do
break if test_compiler "$compiler -std=c++14"; then
CXX=$compiler
echo $CXX
break
fi
done
if test -z "$CXX"; then
echo "none found!"
exit 1
fi fi
done
if test -z $CXX; then
echo "none found!"
exit 1
fi fi
# #