dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update OSX clang version detection

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-01-13 22:55:51 +00:00
parent 0bed63b77f
commit 47c7f8f3bb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config.lib
View File

@@ -1335,7 +1335,7 @@ make_compiler_cflags() {
elif echo "$version_line" | grep -q "clang"; then elif echo "$version_line" | grep -q "clang"; then
# Enable some things only for certain clang versions # Enable some things only for certain clang versions
# Need to try really hard to get the version line, because OSX clang likes to hide its true version # Need to try really hard to get the version line, because OSX clang likes to hide its true version
cc_version="`$1 -v 2>&1 | grep -i version | head -n 1 | sed s@[^0-9]@@g | cut -c 1-2`" cc_version="`$1 -v 2>&1 | grep -i version | head -n 1 | sed s@[^0-9.]@@g | $awk -F . '{printf "%d%02d\n", $1, $2}'`"
# aliasing rules are not held in openttd code # aliasing rules are not held in openttd code
flags="$flags -fno-strict-aliasing" flags="$flags -fno-strict-aliasing"
@@ -1357,14 +1357,14 @@ make_compiler_cflags() {
# it happens when using the FOR_ALL_WINDOWS_FROM_BACK_FROM macro # it happens when using the FOR_ALL_WINDOWS_FROM_BACK_FROM macro
flags="$flags -Wno-self-assign" flags="$flags -Wno-self-assign"
if [ "$cc_version" -lt "30" ]; then if [ "$cc_version" -lt "300" ]; then
# warning: equality comparison with extraneous parentheses # warning: equality comparison with extraneous parentheses
flags="$flags -Wno-parentheses" flags="$flags -Wno-parentheses"
# warning: operands of ? are integers of different signs: 'unsigned int' and 'int' # warning: operands of ? are integers of different signs: 'unsigned int' and 'int'
flags="$flags -Wno-sign-compare" flags="$flags -Wno-sign-compare"
fi fi
if [ "$cc_version" -ge "30" ]; then if [ "$cc_version" -ge "300" ]; then
# warning: equality comparison with extraneous parentheses # warning: equality comparison with extraneous parentheses
# this warning could be useful, but it warns about code in squirrel # this warning could be useful, but it warns about code in squirrel
flags="$flags -Wno-parentheses-equality" flags="$flags -Wno-parentheses-equality"
@@ -1383,8 +1383,8 @@ make_compiler_cflags() {
flags="$flags -Wno-unused-variable" flags="$flags -Wno-unused-variable"
fi fi
if [ "$cc_version" -lt "33" ]; then if [ "$cc_version" -lt "303" ]; then
log 1 "configure: error: clang version is too old: `$1 -v 2>&1 | head -n 1`, minumum: 3.3" log 1 "configure: error: clang version is too old: `$1 -v 2>&1 | grep -i version | head -n 1`, minumum: 3.3"
exit 1 exit 1
fi fi