mirror of https://github.com/stella-emu/stella.git
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:
parent
3ab2ddb870
commit
77479cc0dd
|
@ -348,22 +348,26 @@ esac
|
|||
# Determine the C++ compiler
|
||||
#
|
||||
echo_n "Looking for C++ compiler... "
|
||||
if test -n "$_host"; then
|
||||
compilers="$CXX $_host_prefix-g++ $_host_prefix-c++ $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++"
|
||||
if test -n "$CXX"; then
|
||||
echo $CXX
|
||||
else
|
||||
compilers="$CXX g++ c++"
|
||||
fi
|
||||
if test -n "$_host"; then
|
||||
compilers="$_host_prefix-g++ $_host_prefix-c++ $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++"
|
||||
else
|
||||
compilers="g++ c++"
|
||||
fi
|
||||
|
||||
for compiler in $compilers; do
|
||||
for compiler in $compilers; do
|
||||
if test_compiler "$compiler -std=c++14"; then
|
||||
CXX=$compiler
|
||||
echo $CXX
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z $CXX; then
|
||||
done
|
||||
if test -z "$CXX"; then
|
||||
echo "none found!"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue