diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2026-01-29 13:29:33 +1100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2026-01-29 13:29:33 +1100 |
| commit | 65fb9de4888f9bf32bc4f60c880da3dff04c4fd9 (patch) | |
| tree | ae98fd7a47b569f385fd96e843ef752187620775 | |
| parent | 9ad7f544c696d73ce377bbad83f3cf8b4dd8dcac (diff) | |
| parent | 8eff45dfe93b34b1a027bd22fd8dffe6424f480d (diff) | |
| download | qemu-master.zip qemu-master.tar.gz qemu-master.tar.bz2 | |
Fix build with --enable-modules
# -----BEGIN PGP SIGNATURE-----
#
# iQGzBAABCgAdFiEEZrmU7KFPfy5auggff5BUDQoc0A8FAml6uYIACgkQf5BUDQoc
# 0A+1fgv/VBYR4Svtjbpq9GmAzXYSdqI5WhbDTPMH0mC9dFoFHdpZL0hOiZnXkoXs
# fXLBJkB8zJPTE+f7q9FQS6LTTJVkazSE+EmuqnewQbL4mueEgK1ZZelg2aRmIBCg
# nyQFh+X+p3z6Kt7aErLX4W1tH4OySLrGEu+QCHoSiRBpEPuK9Qeb5chvS9GmEq5o
# 7UGE4eiJ9y3Q7uXx32xo36zaLSwEkUHURp8FVUVxg44z0xDH7JyiJetUQrdxHtWT
# DoAdJR+l1hIqCP60qyd9JZFNNm1QgGBI3D7b0A7GArc/Soa96ikWTpoPid3OK0qd
# l1FxnfacoFOmNKa9kbEtupDGBzs6n3lkjzJ13EgF3pmAvTYKk/efCZ58Or1GdsK8
# IJVPzVx979XrXEIzpNs3KxVvR21TiRQvpF4dOa3GBcHYw+EgFKGoo4sKboYV21CC
# wZDUM7w2iFZKNGr73VzLI+PZUqBSFdCmXGTVddgKFcibnjxizzTJgjz+C1urew9M
# 7E7R/XrT
# =wFh0
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 29 Jan 2026 12:36:02 PM AEDT
# gpg: using RSA key 66B994ECA14F7F2E5ABA081F7F90540D0A1CD00F
# gpg: Good signature from "Pierrick Bouvier <pierrick.bouvier@linaro.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 66B9 94EC A14F 7F2E 5ABA 081F 7F90 540D 0A1C D00F
* tag 'pr-build_fix-20260128' of https://gitlab.com/pbo-linaro/qemu:
meson: fix build of qemu-system-microblaze with --enable-modules
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | meson.build | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 668f1aa..cc0dfed 100644 --- a/meson.build +++ b/meson.build @@ -3958,10 +3958,6 @@ if enable_modules if target.endswith('-softmmu') config_target = config_target_mak[target] arch = config_target['TARGET_NAME'] == 'sparc64' ? 'sparc64' : config_target['TARGET_BASE_ARCH'] - if not hw_arch.has_key(arch) - continue - endif - config_devices_mak = target + '-config-devices.mak' modinfo_src = custom_target('modinfo-' + target + '.c', output: 'modinfo-' + target + '.c', @@ -3971,6 +3967,11 @@ if enable_modules modinfo_lib = static_library('modinfo-' + target + '.c', modinfo_src) modinfo_dep = declare_dependency(link_with: modinfo_lib) + + if not hw_arch.has_key(arch) + hw_arch += {arch: ss.source_set()} + endif + hw_arch[arch].add(modinfo_dep) endif endforeach |