1 |
commit: f5bc55012fa5b5f0cadd2a80dcd501a3b7ede00a |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 31 19:11:47 2015 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 31 19:11:47 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f5bc5501 |
7 |
|
8 |
Revert "Fix build failure with gold linker wrt bug #541262." |
9 |
|
10 |
This reverts commit f6b7f47fb07fda8aa6e0c3be5be7f60c2d541b0d. |
11 |
|
12 |
The bug is already fixed upstream for 5.4.2, see qtbase commit |
13 |
53e2db74dba8135bd88bad48fbf9f2fc81ed4f8b. |
14 |
|
15 |
eclass/qt5-build.eclass | 4 ---- |
16 |
1 file changed, 4 deletions(-) |
17 |
|
18 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
19 |
index a209cec..f8c7674 100644 |
20 |
--- a/eclass/qt5-build.eclass |
21 |
+++ b/eclass/qt5-build.eclass |
22 |
@@ -191,10 +191,6 @@ qt5-build_src_prepare() { |
23 |
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ |
24 |
configure || die "sed failed (QMAKE_CONF_COMPILER)" |
25 |
|
26 |
- # -fuse-ld is a gcc switch, not an ld switch (bug #541262) |
27 |
- sed -i -e '/linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold/s/linker/compiler/' \ |
28 |
- configure || die "sed failed (-fuse-ld)" |
29 |
- |
30 |
# Respect toolchain and flags in config.tests |
31 |
find config.tests/unix -name '*.test' -type f \ |
32 |
-execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \ |