Title: [112282] trunk/Tools
- Revision
- 112282
- Author
- [email protected]
- Date
- 2012-03-27 10:47:39 -0700 (Tue, 27 Mar 2012)
Log Message
[Qt] Make debug build work on 32 bit
https://bugs.webkit.org/show_bug.cgi?id=82331
Use --no-keep-memory option of ld not to cache the symbol tables of input files in
memory to avoid memory exhaustion during the linking phase for x86-debug builds.
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/features/unix/default_post.prf:
* qmake/mkspecs/features/unix/default_pre.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (112281 => 112282)
--- trunk/Tools/ChangeLog 2012-03-27 17:46:59 UTC (rev 112281)
+++ trunk/Tools/ChangeLog 2012-03-27 17:47:39 UTC (rev 112282)
@@ -1,3 +1,16 @@
+2012-03-27 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Make debug build work on 32 bit
+ https://bugs.webkit.org/show_bug.cgi?id=82331
+
+ Use --no-keep-memory option of ld not to cache the symbol tables of input files in
+ memory to avoid memory exhaustion during the linking phase for x86-debug builds.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/unix/default_post.prf:
+ * qmake/mkspecs/features/unix/default_pre.prf:
+
2012-03-23 Balazs Ankes <[email protected]>
Add png checking to check-webkit-style
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_post.prf (112281 => 112282)
--- trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-03-27 17:46:59 UTC (rev 112281)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-03-27 17:47:39 UTC (rev 112282)
@@ -30,4 +30,13 @@
contains(TEMPLATE, app): CONFIG += rpath
+isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) {
+ # Make ld don't cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
+ # We have to use ld, because --no-keep-memory isn't supported by ld.gold.
+ QMAKE_LFLAGS += -Wl,--no-keep-memory
+} else {
+ # Use gold if available
+ !scratchbox:!mac:exists(/usr/bin/ld.gold): QMAKE_LFLAGS += -fuse-ld=gold
+}
+
load(default_post)
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf (112281 => 112282)
--- trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2012-03-27 17:46:59 UTC (rev 112281)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2012-03-27 17:47:39 UTC (rev 112282)
@@ -12,9 +12,6 @@
SBOX_CHECK = $$(_SBOX_DIR)
!isEmpty(SBOX_CHECK): CONFIG += scratchbox
-# Use gold if available
-!scratchbox:!mac:exists(/usr/bin/ld.gold): QMAKE_LFLAGS += -fuse-ld=gold
-
# If Qt is configured with embedded or QPA we set a convenience config
# flag that can be used to test for either of these situations.
contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
