summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-09-07 17:23:17 +0000
committersmatz <smatz@openttd.org>2009-09-07 17:23:17 +0000
commitf104e018c4780ad75819c7fb6a40b0d4bd50c5dc (patch)
treeda3b9194833d562802a598a0ba563fbad348a7f0
parentec63a0fc142b7013f249e762696e9cb662c1d3f2 (diff)
downloadopenttd-f104e018c4780ad75819c7fb6a40b0d4bd50c5dc.tar.xz
(svn r17457) -Codechange: convert icc version to number so it can be compared more easily
-rw-r--r--config.lib9
1 files changed, 4 insertions, 5 deletions
diff --git a/config.lib b/config.lib
index bada28c73..0a847d9f3 100644
--- a/config.lib
+++ b/config.lib
@@ -1046,19 +1046,18 @@ make_compiler_cflags() {
if [ `echo $1 | cut -c 1-3` = "icc" ]; then
# Enable some things only for certain ICC versions
- cc_version=`$1 -dumpversion | cut -c 1-4`
+ cc_version=`$1 -dumpversion | cut -c 1-4 | sed s@\\\.@@g`
flags="$flags -rdynamic"
ldflags="$ldflags -rdynamic"
- if [ "$cc_version" = "10.1" ]; then
+ if [ $cc_version -ge 101 ]; then
flags="$flags -Wno-multichar"
fi
- if [ "$cc_version" = "11.0" ]; then
- # warning 1899: multicharacter character literal (potential portability problem) (e.g. 'FOOD')
+ if [ $cc_version -ge 110 ]; then
# vec report defaults to telling where it did loop vectorisation, which is not very important
- flags="$flags -vec-report=0 -wd1899"
+ flags="$flags -vec-report=0"
fi
else
# Enable some things only for certain GCC versions