block-obj-y is not anymore part of common-obj-y, because "nesting"
variables is complicated and requires specifying the correct
ordering in the calls to unnest-vars.  However, because of this
we need to specify block-obj-y in the dependencies of the
target subdirectories.

Thanks to Stefan Weil and Jeff Cody for suggesting the cause of
the regression.

Reported-by: Peter Maydell <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a443cd4..3938b6c 100644
--- a/Makefile
+++ b/Makefile
@@ -167,7 +167,7 @@ subdir-dtc:dtc/libfdt dtc/tests
 dtc/%:
        mkdir -p $@
 
-$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y)
+$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(block-obj-y)
 
 ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
 romsubdir-%:
-- 
1.8.5.3


Reply via email to