| 1 |
commit: f6b7f47fb07fda8aa6e0c3be5be7f60c2d541b0d |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 31 17:33:09 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 31 17:33:09 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f6b7f47f |
| 7 |
|
| 8 |
[eclass] Fix build failure with gold linker wrt bug #541262. |
| 9 |
|
| 10 |
eclass/qt5-build.eclass | 4 ++++ |
| 11 |
1 file changed, 4 insertions(+) |
| 12 |
|
| 13 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 14 |
index f8c7674..a209cec 100644 |
| 15 |
--- a/eclass/qt5-build.eclass |
| 16 |
+++ b/eclass/qt5-build.eclass |
| 17 |
@@ -191,6 +191,10 @@ qt5-build_src_prepare() { |
| 18 |
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ |
| 19 |
configure || die "sed failed (QMAKE_CONF_COMPILER)" |
| 20 |
|
| 21 |
+ # -fuse-ld is a gcc switch, not an ld switch (bug #541262) |
| 22 |
+ sed -i -e '/linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold/s/linker/compiler/' \ |
| 23 |
+ configure || die "sed failed (-fuse-ld)" |
| 24 |
+ |
| 25 |
# Respect toolchain and flags in config.tests |
| 26 |
find config.tests/unix -name '*.test' -type f \ |
| 27 |
-execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \ |
Archives