[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 75196443ae42a72697a9b4453bcc08a83ddc9ba8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 22:35:40 2010 +0000

    2010-11-02  Marc-Antoine Ruel  <maruel at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Disable incremental linking for webkit_unit_test and DumpRenderTRee on x86 Windows on chromium build.
            https://bugs.webkit.org/show_bug.cgi?id=48836
    
            It fails to link otherwise due to lack of virtual address space.
    
            * WebKit.gyp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71179 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index baf0cf6..4b58da7 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-02  Marc-Antoine Ruel  <maruel at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Disable incremental linking for webkit_unit_test and DumpRenderTRee on x86 Windows on chromium build.
+        https://bugs.webkit.org/show_bug.cgi?id=48836
+
+        It fails to link otherwise due to lack of virtual address space.
+
+        * WebKit.gyp:
+
 2010-11-02  Ilya Sherman  <isherman at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 4ade0a6..45ac985 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -800,6 +800,17 @@
                         }],
                     ],
                 }],
+                ['inside_chromium_build==1 and OS=="win" and component!="shared_library"', {
+                    'configurations': {
+                        'Debug_Base': {
+                            'msvs_settings': {
+                                'VCLinkerTool': {
+                                    'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                                },
+                            },
+                        },
+                    },
+                }],
             ],
         },
         {
@@ -872,6 +883,17 @@
                                 '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
                             ],
                         }],
+                        ['inside_chromium_build==1', {
+                            'configurations': {
+                                'Debug_Base': {
+                                    'msvs_settings': {
+                                        'VCLinkerTool': {
+                                            'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                                        },
+                                    },
+                                },
+                            },
+                        }],
                     ],
                     'copies': [{
                         'destination': '<(PRODUCT_DIR)',

-- 
WebKit Debian packaging