Patchwork Make all-gdbsupport depend on all-bfd

login
register
mail settings
Submitter Simon Marchi
Date Jan. 17, 2020, 6:26 p.m.
Message ID <20200117182622.4216-1-simon.marchi@efficios.com>
Download mbox | patch
Permalink /patch/37426/
State New
Headers show

Comments

Simon Marchi - Jan. 17, 2020, 6:26 p.m.
Trying to run "make all-gdbsupport" at the top-level in a build from scratch
results in:

make[2]: Entering directory '/home/smarchi/build/binutils-gdb/gdbsupport'
  CC       agent.o
In file included from /home/smarchi/src/binutils-gdb/gdbsupport/common-defs.h:133,
                 from /home/smarchi/src/binutils-gdb/gdbsupport/agent.c:20:
/home/smarchi/src/binutils-gdb/gdbsupport/common-types.h:35:10: fatal error: bfd.h: No such file or directory
   35 | #include "bfd.h"
      |          ^~~~~~~

Before building all-gdbsupport, we need all-bfd to run, so that bfd.h is
generated.

(Once this patch is merged in the binutils-gdb repo, I'll send it to gcc
to keep the files in sync.)

ChangeLog:

        * Makefile.def: Add dependencies of all-gdbsupport on all-bfd.
        * Makefile.in: Re-generate.
---
 Makefile.def | 1 +
 Makefile.in  | 1 +
 2 files changed, 2 insertions(+)
Simon Marchi - Jan. 17, 2020, 6:43 p.m.
On 2020-01-17 1:26 p.m., Simon Marchi wrote:
> Trying to run "make all-gdbsupport" at the top-level in a build from scratch
> results in:
> 
> make[2]: Entering directory '/home/smarchi/build/binutils-gdb/gdbsupport'
>   CC       agent.o
> In file included from /home/smarchi/src/binutils-gdb/gdbsupport/common-defs.h:133,
>                  from /home/smarchi/src/binutils-gdb/gdbsupport/agent.c:20:
> /home/smarchi/src/binutils-gdb/gdbsupport/common-types.h:35:10: fatal error: bfd.h: No such file or directory
>    35 | #include "bfd.h"
>       |          ^~~~~~~
> 
> Before building all-gdbsupport, we need all-bfd to run, so that bfd.h is
> generated.
> 
> (Once this patch is merged in the binutils-gdb repo, I'll send it to gcc
> to keep the files in sync.)
> 
> ChangeLog:
> 
>         * Makefile.def: Add dependencies of all-gdbsupport on all-bfd.
>         * Makefile.in: Re-generate.
> ---
>  Makefile.def | 1 +
>  Makefile.in  | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/Makefile.def b/Makefile.def
> index 079fd3e4f16f..253eb45ef141 100644
> --- a/Makefile.def
> +++ b/Makefile.def
> @@ -417,6 +417,7 @@ dependencies = { module=all-libgui; on=all-itcl; };
>  
>  dependencies = { module=configure-gdbsupport; on=configure-bfd; };
>  dependencies = { module=configure-gdbsupport; on=configure-gnulib; };
> +dependencies = { module=all-gdbsupport; on=all-bfd; };
>  dependencies = { module=all-gdbsupport; on=all-gnulib; };
>  
>  // Host modules specific to binutils.
> diff --git a/Makefile.in b/Makefile.in
> index 3f6938a771ce..af38671cbeab 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -51991,6 +51991,7 @@ all-gdb: maybe-all-opcodes
>  all-gdb: maybe-all-libdecnumber
>  all-gdb: maybe-all-libctf
>  configure-gdbsupport: maybe-configure-bfd
> +all-gdbsupport: maybe-all-bfd
>  configure-gprof: maybe-configure-intl
>  all-gprof: maybe-all-libiberty
>  all-gprof: maybe-all-bfd
> -- 
> 2.25.0

Tom suggested on IRC I push this patch right away, so that's what I did.  He will
include that change when he syncs the gdbsupport changes with gcc.

Simon

Patch

diff --git a/Makefile.def b/Makefile.def
index 079fd3e4f16f..253eb45ef141 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -417,6 +417,7 @@  dependencies = { module=all-libgui; on=all-itcl; };
 
 dependencies = { module=configure-gdbsupport; on=configure-bfd; };
 dependencies = { module=configure-gdbsupport; on=configure-gnulib; };
+dependencies = { module=all-gdbsupport; on=all-bfd; };
 dependencies = { module=all-gdbsupport; on=all-gnulib; };
 
 // Host modules specific to binutils.
diff --git a/Makefile.in b/Makefile.in
index 3f6938a771ce..af38671cbeab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51991,6 +51991,7 @@  all-gdb: maybe-all-opcodes
 all-gdb: maybe-all-libdecnumber
 all-gdb: maybe-all-libctf
 configure-gdbsupport: maybe-configure-bfd
+all-gdbsupport: maybe-all-bfd
 configure-gprof: maybe-configure-intl
 all-gprof: maybe-all-libiberty
 all-gprof: maybe-all-bfd