diff options
| author | Max Horn | 2009-03-23 15:47:45 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-23 15:47:45 +0000 |
| commit | 082c1f782d52413403be7e27b92095de992fb825 (patch) | |
| tree | 97cc587930fc8f236140db4ad873299cf3e1ea01 | |
| parent | 3b5a14916d43b2133c103ec168678bc98e224512 (diff) | |
| download | scummvm-rg350-082c1f782d52413403be7e27b92095de992fb825.tar.gz scummvm-rg350-082c1f782d52413403be7e27b92095de992fb825.tar.bz2 scummvm-rg350-082c1f782d52413403be7e27b92095de992fb825.zip | |
Fix compiler detection if CXX is preset to a working compiler but contains a space
svn-id: r39634
| -rwxr-xr-x | configure | 30 |
1 files changed, 18 insertions, 12 deletions
@@ -874,21 +874,27 @@ EOF } # Prepare a list of candidates for the C++ compiler -if test -n "$_host"; then - compilers="$CXX $_host_alias-g++ $_host_alias-c++ $_host-g++ $_host-c++" +if test -n "$CXX" && test_compiler "$CXX"; then + # Use the compiler specified in CXX + echo $CXX else - compilers="$CXX g++ c++" + if test -n "$_host"; then + compilers="$_host_alias-g++ $_host_alias-c++ $_host-g++ $_host-c++" + else + compilers="g++ c++" + fi + + # Iterate over all candidates, pick the first working one + CXX= + for compiler in $compilers; do + if test_compiler $compiler; then + CXX=$compiler + echo $CXX + break + fi + done fi -# Iterate over all candidates, pick the first working one -CXX= -for compiler in $compilers; do - if test_compiler $compiler; then - CXX=$compiler - echo $CXX - break - fi -done if test -z "$CXX"; then echo "none found!" exit 1 |