[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 00653b9d5804391cb80b2650d272f07254075302
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 30 10:40:40 2011 +0000

    2011-01-30  Benjamin Poulain  <ikipou at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] JavaScriptCore does not link on Mac if building WebKit 2
            https://bugs.webkit.org/show_bug.cgi?id=53377
    
            The option "-whole-archive" is not availabe with the libtool of Mac OS X,
            instead, we can use "-all_load" on Mac.
    
            * JavaScriptCore.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77086 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 63c9a5d..6507103 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-30  Benjamin Poulain  <ikipou at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] JavaScriptCore does not link on Mac if building WebKit 2
+        https://bugs.webkit.org/show_bug.cgi?id=53377
+
+        The option "-whole-archive" is not availabe with the libtool of Mac OS X,
+        instead, we can use "-all_load" on Mac.
+
+        * JavaScriptCore.pri:
+
 2011-01-29  Geoffrey Garen  <ggaren at apple.com>
 
         Sorry Leopard bot -- I committed a change by accident.
diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
index 3342b39..06613a1 100644
--- a/Source/JavaScriptCore/JavaScriptCore.pri
+++ b/Source/JavaScriptCore/JavaScriptCore.pri
@@ -91,7 +91,8 @@ defineTest(addJavaScriptCoreLib) {
         QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR
         webkit2 {
             # FIXME Workaround for undefined reference linking issues until the build system gets redesigned
-            LIBS += -Wl,-whole-archive -l$$JAVASCRIPTCORE_TARGET -Wl,-no-whole-archive
+            mac: LIBS += -Wl,-all_load -l$$JAVASCRIPTCORE_TARGET -WL,-noall_load 
+            else: LIBS += -Wl,-whole-archive -l$$JAVASCRIPTCORE_TARGET -Wl,-no-whole-archive
         } else {
             LIBS += -l$$JAVASCRIPTCORE_TARGET
         }

-- 
WebKit Debian packaging