From 7e040d75ed04f437e9f2eb1c61ef2d08aead3359 Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Tue, 28 Nov 2023 22:04:18 +0900 Subject: [PATCH] Add stage2 and other dependencies for check-glibc-linux Some glibc tests like tst-unwind-{main,ctor} depends on stage2 artifacts (in particular, GCC runtime libs) to be properly installed. Add stage2 dependencies to avoid these tests from spuriously failing. The test suite also uses the simulator and Deja GNU, both of which were not declared as dependencies, so add them as well. Closes: https://github.com/riscv-collab/riscv-gnu-toolchain/issues/1379 --- Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index e8443ca1ef0..2c21aab799f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1000,7 +1000,8 @@ stamps/check-gcc-linux: stamps/build-gcc-linux-stage2 $(SIM_STAMP) stamps/build- mkdir -p $(dir $@) date > $@ -stamps/check-glibc-linux-%: $(addprefix stamps/build-glibc-linux-,$(GLIBC_MULTILIB_NAMES)) +stamps/check-glibc-linux-%: stamps/build-gcc-linux-stage2 $(SIM_STAMP) stamps/build-dejagnu \ + $(addprefix stamps/build-glibc-linux-,$(GLIBC_MULTILIB_NAMES)) $(eval $@_BUILD_DIR := $(notdir $@)) $(eval $@_BUILD_DIR := $(subst check-,build-,$($@_BUILD_DIR))) $(SIM_PREPARE) $(MAKE) -C $($@_BUILD_DIR) check