The following commit has been merged in the debian/experimental branch:
commit bc2060d669c714c4c9bb5c31251020525f6b8c3c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 21 13:11:27 2010 +0000
2010-12-21 Mahesh Kulkarni <mahesh.kulkarni at nokia.com>
Reviewed by Andreas Kling.
[Qt] QtWebKit doesn't build in debug on Windows
https://bugs.webkit.org/show_bug.cgi?id=41930
Disable incremental linking in windows 32bit debug version as webkit is so
big it fails to link incremental.
Build fix. No new test cases added.
* WebCore.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74409 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4547891..dbc30bf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-21 Mahesh Kulkarni <mahesh.kulkarni at nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] QtWebKit doesn't build in debug on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=41930
+
+ Disable incremental linking in windows 32bit debug version as webkit is so
+ big it fails to link incremental.
+
+ Build fix. No new test cases added.
+
+ * WebCore.pro:
+
2010-12-21 Dominic Cooney <dominicc at google.com>
Reviewed by Adam Barth.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index e556ef5..2ddf7e3 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -131,6 +131,14 @@ DEFINES += BUILDING_WEBKIT
win32-msvc2005|win32-msvc2008|wince*:{
QMAKE_CFLAGS_RELEASE -= -GL
QMAKE_CXXFLAGS_RELEASE -= -GL
+
+ # Disable incremental linking for windows 32bit OS debug build as WebKit is so big
+ # that linker failes to link incrementally in debug mode.
+ ARCH = $$(PROCESSOR_ARCHITECTURE)
+ WOW64ARCH = $$(PROCESSOR_ARCHITEW6432)
+ equals(ARCH, x86):{
+ isEmpty(WOW64ARCH): QMAKE_LFLAGS_DEBUG += /INCREMENTAL:NO
+ }
}
# Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
--
WebKit Debian packaging