Title: [128885] trunk/Tools
- Revision
- 128885
- Author
- [email protected]
- Date
- 2012-09-18 06:37:47 -0700 (Tue, 18 Sep 2012)
Log Message
[Qt] Remove forced use of gold.
Reviewed by Tor Arne Vestbø.
The choice of what linker to use with WebKit should be taken by Qt's build system and ideally the same for all
modules of Qt. Then in turn it is usually up to the administrator of the machine. Recent Debian based systems
often offer the automatic use of gold through a symlink and a dpkg-diversion when installing the gold package.
* qmake/mkspecs/features/unix/default_post.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128884 => 128885)
--- trunk/Tools/ChangeLog 2012-09-18 13:29:43 UTC (rev 128884)
+++ trunk/Tools/ChangeLog 2012-09-18 13:37:47 UTC (rev 128885)
@@ -1,5 +1,17 @@
2012-09-18 Simon Hausmann <[email protected]>
+ [Qt] Remove forced use of gold.
+
+ Reviewed by Tor Arne Vestbø.
+
+ The choice of what linker to use with WebKit should be taken by Qt's build system and ideally the same for all
+ modules of Qt. Then in turn it is usually up to the administrator of the machine. Recent Debian based systems
+ often offer the automatic use of gold through a symlink and a dpkg-diversion when installing the gold package.
+
+ * qmake/mkspecs/features/unix/default_post.prf:
+
+2012-09-18 Simon Hausmann <[email protected]>
+
[Qt] Prospective Qt/Windows cross-compiling fix
Reviewed by Tor Arne Vestbø.
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_post.prf (128884 => 128885)
--- trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-09-18 13:29:43 UTC (rev 128884)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-09-18 13:37:47 UTC (rev 128885)
@@ -36,12 +36,6 @@
# 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) {
- # Upstream gcc 4.7 does not support the -fuse-ld=gold option ( see: http://sourceware.org/ml/binutils/2011-01/msg00178.html )
- isEqual(QT_GCC_MAJOR_VERSION, 4):lessThan(QT_GCC_MINOR_VERSION, 7):QMAKE_LFLAGS += -fuse-ld=gold
- }
}
load(default_post)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
