[09/16] Add install dependencies for ld -> bfd and libctf -> bfd

Message ID 20210306004023.164154-10-nick.alcock@oracle.com
State New
Headers show
Series
  • libctf: mostly cleanups and refactoring
Related show

Commit Message

CHIGOT, CLEMENT via Binutils March 6, 2021, 12:40 a.m.
This stops problems parallel-installing if a relink of libctf is needed.

ChangeLog
2021-03-02  Nick Alcock  <nick.alcock@oracle.com>

	PR libctf/27482
	* Makefile.def: Add install-bfd dependencies for install-libctf and
	install-ld; move the install-ld dependency on install-libctf to join
	it.
	* Makefile.in: Regenerated.
---
 Makefile.def | 6 +++++-
 Makefile.in  | 4 +++-
 2 files changed, 16 insertions(+), 2 deletions(-)

-- 
2.30.0.252.gc27e85e57d

Comments

CHIGOT, CLEMENT via Binutils March 15, 2021, 1:11 p.m. | #1
On 6 Mar 2021, Nick Alcock via Binutils spake thusly:

> This stops problems parallel-installing if a relink of libctf is needed.


OK, this has now been tested by the original reporter and works. This
unblocks this patch series as far as I'm concerned.

This probably needs review from Alan, since it touches ld's dependencies
and even adds one non-ctf-related one that seems to have been missing
beforehand (ld -> bfd).
CHIGOT, CLEMENT via Binutils March 17, 2021, 2:23 p.m. | #2
On 15 Mar 2021, Nick Alcock via Binutils uttered the following:

> On 6 Mar 2021, Nick Alcock via Binutils spake thusly:

>

>> This stops problems parallel-installing if a relink of libctf is needed.

>

> OK, this has now been tested by the original reporter and works. This

> unblocks this patch series as far as I'm concerned.


.... aaand no sooner did I say that than it was pointed out that
install-strip is distinct from install and needs more rules, so this is
not quite good enough. Will post a v2 soon.

-- 
NULL && (void)

Patch

diff --git a/Makefile.def b/Makefile.def
index b45e580da5b..540db0e73c1 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -448,7 +448,6 @@  dependencies = { module=all-binutils; on=all-intl; };
 dependencies = { module=all-binutils; on=all-gas; };
 dependencies = { module=all-binutils; on=all-libctf; };
 dependencies = { module=all-ld; on=all-libctf; };
-dependencies = { module=install-ld; on=install-libctf; };
 
 // We put install-opcodes before install-binutils because the installed
 // binutils might be on PATH, and they might need the shared opcodes
@@ -456,6 +455,11 @@  dependencies = { module=install-ld; on=install-libctf; };
 dependencies = { module=install-binutils; on=install-opcodes; };
 dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
 
+// Likewise for ld, libctf, and bfd.
+dependencies = { module=install-libctf; on=install-bfd; };
+dependencies = { module=install-ld; on=install-bfd; };
+dependencies = { module=install-ld; on=install-libctf; };
+
 // libopcodes depends on libbfd
 dependencies = { module=install-opcodes; on=install-bfd; };
 dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
diff --git a/Makefile.in b/Makefile.in
index 0a64fc10e5b..ebd137540c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52170,9 +52170,11 @@  all-stage3-ld: maybe-all-stage3-libctf
 all-stage4-ld: maybe-all-stage4-libctf
 all-stageprofile-ld: maybe-all-stageprofile-libctf
 all-stagefeedback-ld: maybe-all-stagefeedback-libctf
-install-ld: maybe-install-libctf
 install-binutils: maybe-install-opcodes
 install-strip-binutils: maybe-install-strip-opcodes
+install-libctf: maybe-install-bfd
+install-ld: maybe-install-bfd
+install-ld: maybe-install-libctf
 install-opcodes: maybe-install-bfd
 install-strip-opcodes: maybe-install-strip-bfd
 configure-gas: maybe-configure-intl