summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-09-28 12:07:01 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-09-28 14:00:10 (GMT)
commit4f82ba7aeb62da4c8f537a697ced68c43d262f8f (patch)
tree482bd59e00ba286aace7b176dad1f98005ec022f /configure
parent61e0576f7b6b7cf3330f58b51e3e5e213919c6bf (diff)
downloadQt-4f82ba7aeb62da4c8f537a697ced68c43d262f8f.zip
Qt-4f82ba7aeb62da4c8f537a697ced68c43d262f8f.tar.gz
Qt-4f82ba7aeb62da4c8f537a697ced68c43d262f8f.tar.bz2
Invert the buildkey logic for compilers.
Make ICC use "g++-4" as the official buildkey, since it's supposed to be completely ABI-compatible. Keep the older build key for compatibility with plugins built with ICC prior to 4.7. Reviewed-By: Bradley T. Hughes
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index 4316cc8..53f520a 100755
--- a/configure
+++ b/configure
@@ -7356,14 +7356,14 @@ g++*)
icc*)
# The Intel CC compiler on Unix systems matches the ABI of the g++
# that is found on PATH
- COMPILER="icc"
- COMPAT_COMPILER="g++-4"
+ COMPAT_COMPILER="icc"
+ COMPILER="g++-4"
case "`g++ -dumpversion` 2>/dev/null" in
2.95.*)
- COMPAT_COMPILER="g++-2.95.*"
+ COMPILER="g++-2.95.*"
;;
3.*)
- COMPAT_COMPILER="g++-3.*"
+a COMPILER="g++-3.*"
;;
*)
;;