aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Naour <romain.naour@gmail.com>2020-06-03 12:30:57 -0600
committerRichard Biener <rguenther@suse.de>2020-07-17 10:26:34 +0200
commite86ae54172bb982e3c9d5aa62d20be5b72fe0f24 (patch)
tree7e91b77ddf58db9fbc608eb98bfb20115473c15d
parent8e6c87b2baee3f031ddef3a90189f2c4435721fe (diff)
Fix missing dependencies for selftests which occasionally causes failed builds.
gcc/ * Makefile.in (SELFTEST_DEPS): Move before including language makefile fragments. (cherry picked from commit b19d8aac15649f31a7588b2634411a1922906ea8)
-rw-r--r--gcc/Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 543b477ff18..5d05e8e0dc8 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1726,6 +1726,10 @@ $(FULL_DRIVER_NAME): ./xgcc
$(LN_S) $< $@
#
+# SELFTEST_DEPS need to be set before including language makefile fragments.
+# Otherwise $(SELFTEST_DEPS) is empty when used from <LANG>/Make-lang.in.
+SELFTEST_DEPS = $(GCC_PASSES) stmp-int-hdrs $(srcdir)/testsuite/selftests
+
# Language makefile fragments.
# The following targets define the interface between us and the languages.
@@ -2001,8 +2005,6 @@ DEVNULL=$(if $(findstring mingw,$(build)),nul,/dev/null)
SELFTEST_FLAGS = -nostdinc $(DEVNULL) -S -o $(DEVNULL) \
-fself-test=$(srcdir)/testsuite/selftests
-SELFTEST_DEPS = $(GCC_PASSES) stmp-int-hdrs $(srcdir)/testsuite/selftests
-
# Run the selftests during the build once we have a driver and the frontend,
# so that self-test failures are caught as early as possible.
# Use "s-selftest-FE" to ensure that we only run the selftests if the