diff mbox series

toplevel: Makefile.def: add install-strip dependency on libsframe

Message ID 20230118001851.3467920-1-indu.bhagat@oracle.com
State Accepted
Headers
Series toplevel: Makefile.def: add install-strip dependency on libsframe |

Checks

Context Check Description
snail/binutils-gdb-check success Github commit url

Commit Message

Indu Bhagat Jan. 18, 2023, 12:18 a.m. UTC 
  [PATCH] toplevel: Makefile.def: add install-strip dependency on libsframe

Hello,

This proposed patch fixes the PR libsframe/30014.  More details in the commit
log below.

bugzilla: https://sourceware.org/bugzilla/show_bug.cgi?id=30014

Testing notes:
- Tested make install-strip-host now works on x86_64 and aarch64 (on master
branch).
- trybot show no new regressions.
- On aarch64, I tested a cross build (with --disable-gprofng as there is
an issue with master currently), no regressions. make install-strip-host looks
OK.
- On x86_64, tested a cross build, no regressions. make install-strip-host
looks OK.

Thanks,

-----------------------------------

As noted in PR libsframe/30014 - FTBFS: install-strip fails because
bfdlib relinks and fails to find libsframe, the install time
dependencies of libbfd need to be updated.

ChangeLog:
	PR libsframe/30014
	* Makefile.def: Reflect that libsframe needs to installed before
	  libbfd.  Reorder a bit to better track libsframe dependencies.
	* Makefile.in: Regenerate.
---
 Makefile.def | 5 ++++-
 Makefile.in  | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/Makefile.def b/Makefile.def
index f549d5741ee..2f51f83b043 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -493,7 +493,6 @@  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-bfd; on=install-libsframe; };
 dependencies = { module=install-libctf; on=install-bfd; };
 dependencies = { module=install-ld; on=install-bfd; };
 dependencies = { module=install-ld; on=install-libctf; };
@@ -501,6 +500,10 @@  dependencies = { module=install-strip-libctf; on=install-strip-bfd; };
 dependencies = { module=install-strip-ld; on=install-strip-bfd; };
 dependencies = { module=install-strip-ld; on=install-strip-libctf; };
 
+// libbfd depends on libsframe
+dependencies = { module=install-bfd; on=install-libsframe; };
+dependencies = { module=install-strip-bfd; on=install-strip-libsframe; };
+
 // libopcodes depends on libbfd
 dependencies = { module=configure-opcodes; on=configure-bfd; hard=true; };
 dependencies = { module=install-opcodes; on=install-bfd; };
diff --git a/Makefile.in b/Makefile.in
index 679e121f8d6..38f1f9abea9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64549,13 +64549,14 @@  all-stageautoprofile-binutils: maybe-all-stageautoprofile-libsframe
 all-stageautofeedback-binutils: maybe-all-stageautofeedback-libsframe
 install-binutils: maybe-install-opcodes
 install-strip-binutils: maybe-install-strip-opcodes
-install-bfd: maybe-install-libsframe
 install-libctf: maybe-install-bfd
 install-ld: maybe-install-bfd
 install-ld: maybe-install-libctf
 install-strip-libctf: maybe-install-strip-bfd
 install-strip-ld: maybe-install-strip-bfd
 install-strip-ld: maybe-install-strip-libctf
+install-bfd: maybe-install-libsframe
+install-strip-bfd: maybe-install-strip-libsframe
 configure-opcodes: configure-bfd
 configure-stage1-opcodes: configure-stage1-bfd
 configure-stage2-opcodes: configure-stage2-bfd