diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-07-07 09:09:32 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-07-08 09:56:49 -0400 |
| commit | e4cbcea361dd5609a2a4cdf5c63ac15837666c50 (patch) | |
| tree | 32eadd461efbea53a55a6b6dbf4f3b31c98035f3 | |
| parent | f1cee837665a932d3d747597d8512cd0d3650478 (diff) | |
| download | gdb-e4cbcea361dd5609a2a4cdf5c63ac15837666c50.zip gdb-e4cbcea361dd5609a2a4cdf5c63ac15837666c50.tar.gz gdb-e4cbcea361dd5609a2a4cdf5c63ac15837666c50.tar.bz2 | |
gdb/Makefile.in: remove testsuite from SUBDIRS
When distclean-ing a configured / built gdb directory, like so:
$ ./configure && make all-gdb && make distclean
The distclean operation fails with:
Missing testsuite/Makefile
If we look at the SUBDIRS variable in the generated gdb/Makefile,
testsuite is there twice:
SUBDIRS = doc testsuite data-directory testsuite
So we try distclean-ing the testsuite directory twice. The second time,
gdb/testsuite/Makefile doesn't exist, so it fails.
The first "testsuite" comes from the @subdirs@ replacement, because of
the `AC_CONFIG_SUBDIRS` macro in gdb/configure.ac. The second one is
hard-coded in gdb/Makefile.in:
SUBDIRS = doc @subdirs@ data-directory testsuite
The hard-coded was added by:
bdbbcd577460 ("Always build 'all' in gdb/testsuite")
which came after `testsuite` was removed from @subdirs@ by:
f99d1d37496f ("Remove gdb/testsuite/configure")
My commit a100a94530eb ("gdb/testsuite: restore configure script")
should have removed the hard-coded `testsuite`, since it added it back
as a "subdir", but I missed it because I only looked f99d1d37496f to
write my patch.
Fix this by removing the hard-coded one.
This patch should be pushed to both master and gdb-11-branch, hence the
ChangeLog entry:
gdb/ChangeLog:
* Makefile.in (SUBDIRS): Remove testsuite.
Change-Id: I63e5590b1a08673c646510b3ecc74600eae9f92d
| -rw-r--r-- | gdb/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 1bc9788..53beb3a 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1591,7 +1591,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ $(SUBDIR_TARGET_OBS) \ $(SUBDIR_GCC_COMPILE_OBS) -SUBDIRS = doc @subdirs@ data-directory testsuite +SUBDIRS = doc @subdirs@ data-directory CLEANDIRS = $(SUBDIRS) # List of subdirectories in the build tree that must exist. |