Add support for Intel compiler on Linux QT port.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Mar 2012 10:09:34 +0000 (10:09 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Mar 2012 10:09:34 +0000 (10:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=81077

Patch by Kwonjin Jeong <gram@company100.net> on 2012-03-28
Reviewed by Tor Arne Vestbø.

* qmake/mkspecs/features/default_post.prf:
Don't hide symbols when building with Intel compiler.
The symbols are needed when building QtWebKit tests.

* qmake/mkspecs/features/unix/icc.prf:
Added to ignore icc-specific warnings.
This feature is used with command-line arguments for build-webkit script.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112380 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/qmake/mkspecs/features/default_post.prf
Tools/qmake/mkspecs/features/unix/icc.prf [new file with mode: 0644]

index f5289ca..5b1452a 100644 (file)
@@ -1,3 +1,18 @@
+2012-03-28  Kwonjin Jeong  <gram@company100.net>
+
+        Add support for Intel compiler on Linux QT port.
+        https://bugs.webkit.org/show_bug.cgi?id=81077
+
+        Reviewed by Tor Arne Vestbø.
+
+        * qmake/mkspecs/features/default_post.prf:
+        Don't hide symbols when building with Intel compiler.
+        The symbols are needed when building QtWebKit tests.
+
+        * qmake/mkspecs/features/unix/icc.prf:
+        Added to ignore icc-specific warnings.
+        This feature is used with command-line arguments for build-webkit script.
+
 2012-03-28  Philippe Normand  <pnormand@igalia.com>
 
         Unreviewed, trivial update-webkit-libs-jhbuild system call fix.
index 2c3c60b..6abb114 100644 (file)
@@ -135,7 +135,7 @@ contains(TEMPLATE, lib) {
     win32-msvc*|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32
 
     !plugin {
-        !linux-g++*:contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+        !linux-g++*:!linux-icc*:contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
         unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
     }
 }
diff --git a/Tools/qmake/mkspecs/features/unix/icc.prf b/Tools/qmake/mkspecs/features/unix/icc.prf
new file mode 100644 (file)
index 0000000..e9bfddd
--- /dev/null
@@ -0,0 +1,8 @@
+# -------------------------------------------------------------------
+# This optional feature file adds rules that compile using Intel
+# compiler easier.
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+QMAKE_CXXFLAGS += -wd68,161,175,177,239,411,654,864,873,1125,2089,2196