cpp/openttd-patchpack/source Changeset - r14535:d25dadcc6a29

Changeset - r14535:d25dadcc6a29

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 15 years ago 2010-02-13 00:20:19
rubidium@openttd.org

(svn r19116) -Fix [FS#3615]: enabling ccache via environment variables failed to properly detect/set a compiler

1 file changed with 5 insertions and 5 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -1646,13 +1646,13 @@ check_compiler() { @@
 			compiler="$3"
 		else
 			compiler="$3-$6"
 		fi
 		machine=`eval $compiler $9 2>/dev/null`
 		ret=$?
 		eval "$2=$compiler"
+		eval "$2=\"$compiler\""
 		log 2 "executing $compiler $9"
 		log 2 "  returned $machine"
 		log 2 "  exit code $ret"
 		if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
@@ @@ -1667,13 +1667,13 @@ check_compiler() { @@
 			exit 1
 		fi
 	elif [ -n "$4" ]; then
 		# Check for manual compiler
 		machine=`$4 $9 2>/dev/null`
 		ret=$?
 		eval "$2=$4"
+		eval "$2=\"$4\""
 		log 2 "executing $4 $9"
 		log 2 "  returned $machine"
 		log 2 "  exit code $ret"
 		if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
@@ @@ -1684,13 +1684,13 @@ check_compiler() { @@
 	else
 		# Nothing given, autodetect
 		if [ -n "$5" ]; then
 			machine=`$5 $9 2>/dev/null`
 			ret=$?
 			eval "$2=$5"
+			eval "$2=\"$5\""
 			log 2 "executing $5 $9"
 			log 2 "  returned $machine"
 			log 2 "  exit code $ret"
 			# The user defined a GCC that doesn't reply to $9.. abort
@@ @@ -1703,23 +1703,23 @@ check_compiler() { @@
 		else
 			log 2 "checking $1... CC/CXX not set (skipping)"
 			# No $5, so try '$6'
 			machine=`$6 $9 2>/dev/null`
 			ret=$?
 			eval "$2=$6"
+			eval "$2=\"$6\""
 			log 2 "executing $6 $9"
 			log 2 "  returned $machine"
 			log 2 "  exit code $ret"
 			if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
 				# Maybe '$7'?
 				machine=`$7 $9 2>/dev/null`
 				ret=$?
 				eval "$2=$7"
+				eval "$2=\"$7\""
 				log 2 "executing $7 $9"
 				log 2 "  returned $machine"
 				log 2 "  exit code $ret"
 				# All failed, abort

0 comments (0 inline, 0 general)