aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuyuki Ishi <ishitatsuyuki@gmail.com>2023-11-28 22:04:18 +0900
committerChristoph Müllner <christophm30@gmail.com>2023-11-30 21:34:58 +0100
commitfcc49c7f4a19f6c41383894ef55e0488751ae875 (patch)
tree3cca79fe87311ea0665e2436682909e90c056b52
parenta19f6714278f6bef51bc1f87e7e15c812ad645ce (diff)
downloadriscv-gnu-toolchain-fcc49c7f4a19f6c41383894ef55e0488751ae875.zip
riscv-gnu-toolchain-fcc49c7f4a19f6c41383894ef55e0488751ae875.tar.gz
riscv-gnu-toolchain-fcc49c7f4a19f6c41383894ef55e0488751ae875.tar.bz2
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
-rw-r--r--Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index e8443ca..2c21aab 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