cpp/openttd-patchpack/source Changeset - r22963:54d096b0185e

Changeset - r22963:54d096b0185e

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Jonathan G Rennison - 7 years ago 2018-05-10 00:05:40
j.g.rennison@gmail.com

Codechange: detect native Apple clang correctly in config.lib #6773

Fixes: 00c16032569d943e4fac5c5b6218dfce47479716

1 file changed with 3 insertions and 3 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -1229,14 +1229,14 @@ make_compiler_cflags() { @@
 	# $5 - name of the features variable
 	# Get the compiler to tell us who it is
-	compiler="`$1 --version | head -n1 | cut -d' ' -f1`"
+	version_line="`$1 --version | head -n1`"
 	eval eval "flags=\\\$$2"
 	eval eval "cxxflags=\\\$$3"
 	eval eval "ldflags=\\\$$4"
 	eval eval "features=\\\$$5"
-	if [ "$compiler" = "icc" ]; then
+	if [ `echo "$version_line" | cut -d' ' -f1` = "icc" ]; then
 		# Enable some things only for certain ICC versions
 		cc_version=`$1 -dumpversion | cut -c 1-4 | sed s@\\\.@@g`
@@ @@ -1323,7 +1323,7 @@ make_compiler_cflags() { @@
 				features="$features lto"
 			fi
 		fi
-	elif [ "$compiler" = "clang" ]; then
+	elif echo "$version_line" | grep -q "clang"; then
 		# Enable some things only for certain clang versions
 		cc_version="`$1 -v 2>&1 | head -n 1 | sed s@[^0-9]@@g | cut -c 1-2`"

0 comments (0 inline, 0 general)