commit:     f6b7f47fb07fda8aa6e0c3be5be7f60c2d541b0d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 17:33:09 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun May 31 17:33:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f6b7f47f

[eclass] Fix build failure with gold linker wrt bug #541262.

 eclass/qt5-build.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f8c7674..a209cec 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -191,6 +191,10 @@ qt5-build_src_prepare() {
                sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
                        configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
+               # -fuse-ld is a gcc switch, not an ld switch (bug #541262)
+               sed -i -e '/linkerSupportsFlag $TEST_COMPILER 
-fuse-ld=gold/s/linker/compiler/' \
+                       configure || die "sed failed (-fuse-ld)"
+
                # Respect toolchain and flags in config.tests
                find config.tests/unix -name '*.test' -type f \
                        -execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \

Reply via email to