Title: [128886] trunk/Tools
- Revision
- 128886
- Author
- [email protected]
- Date
- 2012-09-18 06:51:18 -0700 (Tue, 18 Sep 2012)
Log Message
[Qt] Fix build with some versions of the gold linker
Reviewed by Tor Arne Vestbø.
Don't unconditionally pass --no-keep-memory to the linker, some versions might not support it.
Instead run a compile/link test first to see if it works.
* qmake/config.tests/gnuld/gnuld.pro: Added.
* qmake/config.tests/gnuld/main.cpp: Added.
(main):
* qmake/mkspecs/features/unix/default_post.prf:
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (128885 => 128886)
--- trunk/Tools/ChangeLog 2012-09-18 13:37:47 UTC (rev 128885)
+++ trunk/Tools/ChangeLog 2012-09-18 13:51:18 UTC (rev 128886)
@@ -1,5 +1,19 @@
2012-09-18 Simon Hausmann <[email protected]>
+ [Qt] Fix build with some versions of the gold linker
+
+ Reviewed by Tor Arne Vestbø.
+
+ Don't unconditionally pass --no-keep-memory to the linker, some versions might not support it.
+ Instead run a compile/link test first to see if it works.
+
+ * qmake/config.tests/gnuld/gnuld.pro: Added.
+ * qmake/config.tests/gnuld/main.cpp: Added.
+ (main):
+ * qmake/mkspecs/features/unix/default_post.prf:
+
+2012-09-18 Simon Hausmann <[email protected]>
+
[Qt] Remove forced use of gold.
Reviewed by Tor Arne Vestbø.
Added: trunk/Tools/qmake/config.tests/gnuld/gnuld.pro (0 => 128886)
--- trunk/Tools/qmake/config.tests/gnuld/gnuld.pro (rev 0)
+++ trunk/Tools/qmake/config.tests/gnuld/gnuld.pro 2012-09-18 13:51:18 UTC (rev 128886)
@@ -0,0 +1,4 @@
+TEMPLATE = app
+TARGET = gnuld
+SOURCES = main.cpp
+QMAKE_LFLAGS += -Wl,--no-keep-memory
Added: trunk/Tools/qmake/config.tests/gnuld/main.cpp (0 => 128886)
--- trunk/Tools/qmake/config.tests/gnuld/main.cpp (rev 0)
+++ trunk/Tools/qmake/config.tests/gnuld/main.cpp 2012-09-18 13:51:18 UTC (rev 128886)
@@ -0,0 +1,5 @@
+
+int main()
+{
+ return 0;
+}
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_post.prf (128885 => 128886)
--- trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-09-18 13:37:47 UTC (rev 128885)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-09-18 13:51:18 UTC (rev 128886)
@@ -33,9 +33,8 @@
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
+ # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
+ config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory
}
load(default_post)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
