Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 30 Sep 2018 20:06:00
Message-Id: 1538337944.2dd49b494e19472aac612afea0d1540274684419.whissi@gentoo
1 commit: 2dd49b494e19472aac612afea0d1540274684419
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 30 19:56:59 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 30 20:05:44 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd49b49
7
8 mozcoreconf-v6.eclass: don't set ldflags lld doesn't support
9
10 Closes: https://bugs.gentoo.org/667224
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 eclass/mozcoreconf-v6.eclass | 18 ++++++++++++++++--
14 1 file changed, 16 insertions(+), 2 deletions(-)
15
16 diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
17 index 571f195b8e4..862d632cd99 100644
18 --- a/eclass/mozcoreconf-v6.eclass
19 +++ b/eclass/mozcoreconf-v6.eclass
20 @@ -204,7 +204,14 @@ mozconfig_init() {
21 case "${ARCH}" in
22 arm)
23 # Reduce the memory requirements for linking
24 - append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
25 + if use clang ; then
26 + # Nothing to do
27 + :;
28 + elif tc-ld-is-gold ; then
29 + append-ldflags -Wl,--no-keep-memory
30 + else
31 + append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
32 + fi
33 ;;
34 alpha)
35 # Historically we have needed to add -fPIC manually for 64-bit.
36 @@ -219,7 +226,14 @@ mozconfig_init() {
37 ppc64)
38 append-flags -fPIC -mminimal-toc
39 # Reduce the memory requirements for linking
40 - append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
41 + if use clang ; then
42 + # Nothing to do
43 + :;
44 + elif tc-ld-is-gold ; then
45 + append-ldflags -Wl,--no-keep-memory
46 + else
47 + append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
48 + fi
49 ;;
50 esac