[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 40fbf1e8f9847a9777cacc5678837888e0a49878
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 14:15:39 2011 +0000

    2011-01-19  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
    
            Reviewed by Andreas Kling.
    
            Enable usage of Google ld if it exist but is not on by default.
    
            [Qt] Enable the google ld if it exist but is not on by default
            https://bugs.webkit.org/show_bug.cgi?id=52625
    
            * common.pri: flip the test.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76120 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index ffe778f..d533e01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-19  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Enable usage of Google ld if it exist but is not on by default.
+
+        [Qt] Enable the google ld if it exist but is not on by default
+        https://bugs.webkit.org/show_bug.cgi?id=52625
+
+        * common.pri: flip the test.
+
 2011-01-18  Mihai Parparita  <mihaip at chromium.org>
 
         Unreviewed. Update .gitignore to reflect that WebKit is now in Source.
diff --git a/common.pri b/common.pri
index c9843bb..e6973f4 100644
--- a/common.pri
+++ b/common.pri
@@ -4,10 +4,8 @@ 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) {
+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
 }
 }

-- 
WebKit Debian packaging