Support fall-back dependency tracking

1 files changed, 16 insertions, 1 deletions

diff --git a/build/bootstrap.make b/build/bootstrap.make
index 09d2864..12e28db 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -46,12 +46,27 @@ $(error dist_prefix is not set)
 endif
 endif
 
-# Don't include dependency info for certain targets.
+# If we don't have dependency auto-generation then we need to manually
+# make sure that generated files are generated before C++ file are
+# compiler. To do this we make the object files ($2) depend in order-
+# only on generated files ($3).
 #
+ifeq ($(cxx_id),generic)
+
+define include-dep
+$(if $2,$(eval $2: | $3))
+endef
+
+else
+
 define include-dep
 $(call -include,$1)
 endef
 
+endif
+
+# Don't include dependency info for certain targets.
+#
 ifneq ($(filter $(MAKECMDGOALS),clean disfigure dist),)
 include-dep =
 endif