[Scummvm-cvs-logs] SF.net SVN: scummvm:[39634] scummvm/trunk/configure

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Mar 23 16:47:46 CET 2009


Revision: 39634
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39634&view=rev
Author:   fingolfin
Date:     2009-03-23 15:47:45 +0000 (Mon, 23 Mar 2009)

Log Message:
-----------
Fix compiler detection if CXX is preset to a working compiler but contains a space

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-03-23 14:24:10 UTC (rev 39633)
+++ scummvm/trunk/configure	2009-03-23 15:47:45 UTC (rev 39634)
@@ -874,21 +874,27 @@
 }
 
 # 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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list