Merge commit 'a0bf3110668d2e9cb9ecf4826fe2a17a1d229b58' into edge

kozyilmaz · Aug 15, 2018 · 354c4ce · 354c4ce
2 parents 6611033 + a0bf311
commit 354c4ce
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tools/libmakefile/Makefile.lib b/tools/libmakefile/Makefile.lib
@@ -44,6 +44,7 @@
 #   20180228 - rename distdir to dist.dir
 #   20180718 - fix @.cmd
 #   20180723 - use file_cflags-y if exists
+#   20180807 - fix circular dependency with complex makefile setup
 
 #
 # Example
@@ -704,7 +705,7 @@ define target-defaults_base
     $($1_objects_m):   .$1/%.o: .$1/%.d $(MAKEFILE_LIST)
     $($1_objects_e):   $(MAKEFILE_LIST)
 
-    $(target-depends): $(filter-out $($1_depends), $($1_depends-y))
+    $(target-depends): $(filter-out $(target-builds) $($1_depends), $($1_depends-y))
 
     $1: .$1/$1 $(MAKEFILE_LIST)
 	$(do_cp)