aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2015-05-31 19:11:47 (GMT)
committerDavide Pesavento <pesa@gentoo.org>2015-05-31 19:11:47 (GMT)
commitf5bc55012fa5b5f0cadd2a80dcd501a3b7ede00a (patch)
tree249bc5e209d95115d58c152031c44be4fb0099c2
parent[eclass] Fix build failure with gold linker wrt bug #541262. (diff)
downloadqt-master.zip
qt-master.tar.gz
qt-master.tar.bz2
Revert "Fix build failure with gold linker wrt bug #541262."HEADmaster
This reverts commit f6b7f47fb07fda8aa6e0c3be5be7f60c2d541b0d. The bug is already fixed upstream for 5.4.2, see qtbase commit 53e2db74dba8135bd88bad48fbf9f2fc81ed4f8b.
-rw-r--r--eclass/qt5-build.eclass4
1 files changed, 0 insertions, 4 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a209cec..f8c7674 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -191,10 +191,6 @@ 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 //' '{}' + \