From ba4d88ad892fe29c6ca7938c8861f8edef5f7a3f Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 12 Oct 2020 16:04:32 +0100 Subject: [PATCH] gdb/gdbserver: add dependencies for distclean-gnulib After commit: commit 361cb219351d8b7e39e1962fe77f40aa80657b27 Date: Tue Oct 6 10:09:06 2020 +0100 gnulib: Ensure all libraries are used when building gdb/gdbserver We now get an error when, at the top level of the build tree, we do 'make distclean'. The reason for this is that the gnulib directory is cleaned before the gdb directory, cleaning gnulib deletes Makefile.gnulib.inc from the gnulib build directory, which is currently pulled in by the gdb Makefile.in using 'include'. This commit adds a dependency between distclean-gnulib and both distclean-gdb and distclean-gdbserver. This means that gdb and gdbserver will be cleaned before gnulib, as a result the Makefile.gnulib.inc file should exist when needed. ChangeLog: * Makefile.in: Rebuild. * Makefile.def: Make distclean-gnulib depend on distclean-gdb and distclean-gdbserver. --- ChangeLog | 6 ++++++ Makefile.def | 6 ++++++ Makefile.in | 2 ++ 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3e0e274ba31..9daa7be3226 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-10-14 Andrew Burgess + + * Makefile.in: Rebuild. + * Makefile.def: Make distclean-gnulib depend on distclean-gdb and + distclean-gdbserver. + 2020-07-24 Aaron Merey * configure: Rebuild. diff --git a/Makefile.def b/Makefile.def index 76d062bb671..089e70ae3ed 100644 --- a/Makefile.def +++ b/Makefile.def @@ -548,6 +548,12 @@ dependencies = { module=configure-libctf; on=all-intl; }; dependencies = { module=configure-libctf; on=all-zlib; }; dependencies = { module=configure-libctf; on=all-libiconv; }; +// The Makefiles in gdb and gdbserver pull in a file that configure +// generates in the gnulib directory, so distclean gnulib only after +// gdb and gdbserver. +dependencies = { module=distclean-gnulib; on=distclean-gdb; }; +dependencies = { module=distclean-gnulib; on=distclean-gdbserver; }; + // Warning, these are not well tested. dependencies = { module=all-bison; on=all-intl; }; dependencies = { module=all-bison; on=all-build-texinfo; }; diff --git a/Makefile.in b/Makefile.in index 9dfd39fae13..fe34132f9e5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52366,6 +52366,8 @@ configure-stage3-libctf: maybe-all-stage3-libiconv configure-stage4-libctf: maybe-all-stage4-libiconv configure-stageprofile-libctf: maybe-all-stageprofile-libiconv configure-stagefeedback-libctf: maybe-all-stagefeedback-libiconv +distclean-gnulib: maybe-distclean-gdb +distclean-gnulib: maybe-distclean-gdbserver all-bison: maybe-all-build-texinfo all-flex: maybe-all-build-bison all-flex: maybe-all-m4 -- 2.39.2