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)
(cherry picked from commit e86ae54172bb982e3c9d5aa62d20be5b72fe0f24)

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index abae872cd638dec77b1b230470c93993c156b7f0..35d90f12d4c22d237fbf1efb6615e50ae9f5f4af 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1687,6 +1687,10 @@ $(FULL_DRIVER_NAME): ./xgcc
        $(LN_S) $< $@
 
 #\f
+# 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.
@@ -1950,8 +1954,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