2010-11-16 Andreas Kling <kling@webkit.org>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt][Scratchbox] Use gold linker explicitly when available

        gold is faster at linking QtWebKit than binutils ld, but it cannot be
        enabled by default on a system that compiles other Qt projects.
        This is due to gold not supporting the --add-needed flag.

        Original patch by Kimmo Kinnunen.

        * common.pri:

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

diff --git a/ChangeLog b/ChangeLog
index aea7586..d2667de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [Qt][Scratchbox] Use gold linker explicitly when available
+
+        gold is faster at linking QtWebKit than binutils ld, but it cannot be
+        enabled by default on a system that compiles other Qt projects.
+        This is due to gold not supporting the --add-needed flag.
+
+        Original patch by Kimmo Kinnunen.
+
+        * common.pri:
+
+2010-11-16  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         [Qt] Add 'valgrind' build mode
 
         Passing CONFIG+=valgrind to qmake will now build WebKit in a way

diff --git a/common.pri b/common.pri
index 91a7785..aa6b8e7 100644 (file)
--- a/common.pri
+++ b/common.pri
@@ -3,3 +3,12 @@
 contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
 contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
 
+linux-g++ {
+isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
+    message(Using gold linker)
+    QMAKE_CFLAGS+=-fuse-ld=gold
+    QMAKE_CXXFLAGS+=-fuse-ld=gold
+    QMAKE_LFLAGS+=-fuse-ld=gold
+}
+}
+