Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 3/3] eclass/tests/toolchain-funcs.sh: Handle missing ld.gold gracefully
Date: Sat, 08 Oct 2022 09:44:26
Message-Id: 20221008094329.316318-4-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/3] toolchain-funcs.eclass: support for querying C++ stdlib and compiler runtime by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/tests/toolchain-funcs.sh | 64 +++++++++++++++++----------------
4 1 file changed, 34 insertions(+), 30 deletions(-)
5
6 diff --git a/eclass/tests/toolchain-funcs.sh b/eclass/tests/toolchain-funcs.sh
7 index d8a357fb24fe..08cfd74611aa 100755
8 --- a/eclass/tests/toolchain-funcs.sh
9 +++ b/eclass/tests/toolchain-funcs.sh
10 @@ -60,20 +60,22 @@ tbegin "tc-ld-is-gold (ld=bfd cc=bfd)"
11 LD=ld.bfd LDFLAGS=-fuse-ld=bfd tc-ld-is-gold && ret=1 || ret=0
12 tend ${ret}
13
14 -tbegin "tc-ld-is-gold (ld=gold cc=default)"
15 -LD=ld.gold tc-ld-is-gold
16 -ret=$?
17 -tend ${ret}
18 -
19 -tbegin "tc-ld-is-gold (ld=gold cc=bfd)"
20 -LD=ld.gold LDFLAGS=-fuse-ld=bfd tc-ld-is-gold
21 -ret=$?
22 -tend ${ret}
23 -
24 -tbegin "tc-ld-is-gold (ld=bfd cc=gold)"
25 -LD=ld.bfd LDFLAGS=-fuse-ld=gold tc-ld-is-gold
26 -ret=$?
27 -tend ${ret}
28 +if type -P ld.gold &>/dev/null; then
29 + tbegin "tc-ld-is-gold (ld=gold cc=default)"
30 + LD=ld.gold tc-ld-is-gold
31 + ret=$?
32 + tend ${ret}
33 +
34 + tbegin "tc-ld-is-gold (ld=gold cc=bfd)"
35 + LD=ld.gold LDFLAGS=-fuse-ld=bfd tc-ld-is-gold
36 + ret=$?
37 + tend ${ret}
38 +
39 + tbegin "tc-ld-is-gold (ld=bfd cc=gold)"
40 + LD=ld.bfd LDFLAGS=-fuse-ld=gold tc-ld-is-gold
41 + ret=$?
42 + tend ${ret}
43 +fi
44
45 #
46 # TEST: tc-ld-disable-gold
47 @@ -87,23 +89,25 @@ tc-ld-disable-gold
48 )
49 tend $?
50
51 -tbegin "tc-ld-disable-gold (ld=gold)"
52 -(
53 -export LD=ld.gold LDFLAGS=
54 -ewarn() { :; }
55 -tc-ld-disable-gold
56 -[[ ${LD} == "ld.bfd" || ${LDFLAGS} == *"-fuse-ld=bfd"* ]]
57 -)
58 -tend $?
59 +if type -P ld.gold &>/dev/null; then
60 + tbegin "tc-ld-disable-gold (ld=gold)"
61 + (
62 + export LD=ld.gold LDFLAGS=
63 + ewarn() { :; }
64 + tc-ld-disable-gold
65 + [[ ${LD} == "ld.bfd" || ${LDFLAGS} == *"-fuse-ld=bfd"* ]]
66 + )
67 + tend $?
68
69 -tbegin "tc-ld-disable-gold (cc=gold)"
70 -(
71 -export LD= LDFLAGS="-fuse-ld=gold"
72 -ewarn() { :; }
73 -tc-ld-disable-gold
74 -[[ ${LD} == *"/ld.bfd" || ${LDFLAGS} == "-fuse-ld=gold -fuse-ld=bfd" ]]
75 -)
76 -tend $?
77 + tbegin "tc-ld-disable-gold (cc=gold)"
78 + (
79 + export LD= LDFLAGS="-fuse-ld=gold"
80 + ewarn() { :; }
81 + tc-ld-disable-gold
82 + [[ ${LD} == *"/ld.bfd" || ${LDFLAGS} == "-fuse-ld=gold -fuse-ld=bfd" ]]
83 + )
84 + tend $?
85 +fi
86
87 unset CPP
88
89 --
90 2.38.0