aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2020-06-24 15:10:39 +0200
committerGerd Hoffmann <kraxel@redhat.com>2020-07-07 15:29:31 +0200
commitc4ddab7ae5362669837d5d63ccc55f1ffa190eca (patch)
tree9e3814f60eff4662327f8e36f54feec2e649897d
parent7ab6e7fcce9729d3a85e7e04737bc64a45a08772 (diff)
downloadqemu-c4ddab7ae5362669837d5d63ccc55f1ffa190eca.zip
qemu-c4ddab7ae5362669837d5d63ccc55f1ffa190eca.tar.gz
qemu-c4ddab7ae5362669837d5d63ccc55f1ffa190eca.tar.bz2
build: fix device module builds
Slightly hackish workaround, works ok as long as we don't have target-specific modules. meson will obsolete this. See comment in the patch for the --verbose description. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20200624131045.14512-5-kraxel@redhat.com [ kraxel: updated comment from discussions ] Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--Makefile.target14
1 files changed, 14 insertions, 0 deletions
diff --git a/Makefile.target b/Makefile.target
index 8ed1eba..02bd9d7 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -179,6 +179,20 @@ endif # CONFIG_SOFTMMU
dummy := $(call unnest-vars,,obj-y)
all-obj-y := $(obj-y)
+#
+# common-obj-m has some crap here, probably as side effect from
+# unnest-vars recursing into target directories to fill obj-y and not
+# properly handling the -m case.
+#
+# Clear common-obj-m as workaround. Fixes suspious dependency errors
+# when building devices as modules. A bit hackish, but should be ok
+# as long as we do not have any target-specific modules.
+#
+# The meson-based build system currently in development doesn't need
+# unnest-vars and will obsolete this workaround.
+#
+common-obj-m :=
+
include $(SRC_PATH)/Makefile.objs
dummy := $(call unnest-vars,.., \
authz-obj-y \