From bdbbcd577460964c28e7e89593ec3ebbf6e9208b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 1 Jun 2021 08:11:30 -0600 Subject: [PATCH] Always build 'all' in gdb/testsuite gdb's Makefile currently excludes testsuite from the subdirectories to build. I don't think there's a good reason for this, so this patch adds testsuite to the SUBDIRS list and removes a special case from 'all'. gdb/ChangeLog 2021-06-01 Tom Tromey * Makefile.in (SUBDIRS): Add testsuite. (all): Don't exclude testsuite. --- gdb/ChangeLog | 5 +++++ gdb/Makefile.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5e882d776b2..506bccf2022 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-06-01 Tom Tromey + + * Makefile.in (SUBDIRS): Add testsuite. + (all): Don't exclude testsuite. + 2021-06-01 Tom Tromey * configure.ac: Copy some code from testsuite/configure.ac. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 9dc96eec867..f66f437f4f3 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 +SUBDIRS = doc @subdirs@ data-directory testsuite CLEANDIRS = $(SUBDIRS) # List of subdirectories in the build tree that must exist. @@ -1633,7 +1633,7 @@ generated_files = \ PYTHON_CFLAGS = @PYTHON_CFLAGS@ all: gdb$(EXEEXT) $(CONFIG_ALL) gdb-gdb.py gdb-gdb.gdb - @$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do + @$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=$(SUBDIRS)" subdir_do # Rule for compiling .c files in the top-level gdb directory. # The order-only dependencies ensure that we create the build subdirectories. -- 2.30.2