diff options
| author | Paolo Bonzini | 2020-09-21 11:11:01 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2020-10-03 14:18:57 +0200 |
| commit | a9a74907863ed02a18b7bc27b21a60a82914ab3f (patch) | |
| tree | 3dec385835caea645e7fabb5dcd0f0443db4512c /meson.build | |
| parent | configure: move OpenBSD W^X test to meson (diff) | |
| download | qemu-a9a74907863ed02a18b7bc27b21a60a82914ab3f.tar.gz qemu-a9a74907863ed02a18b7bc27b21a60a82914ab3f.tar.xz qemu-a9a74907863ed02a18b7bc27b21a60a82914ab3f.zip | |
default-configs: use TARGET_ARCH key
Replace the individual TARGET_*=y lines with TARGET_ARCH,
similar to how TARGET_BASE_ARCH is handled already.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 60ecd03fbd..5f5d916364 100644 --- a/meson.build +++ b/meson.build @@ -727,7 +727,7 @@ kconfig_external_symbols = [ 'CONFIG_LINUX', 'CONFIG_PVRDMA', ] -ignored = ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] +ignored = [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] default_targets = 'CONFIG_DEFAULT_TARGETS' in config_host actual_target_dirs = [] @@ -780,6 +780,7 @@ foreach target : target_dirs actual_target_dirs += target config_target += keyval.load('default-configs/targets' / target + '.mak') + config_target += { 'TARGET_' + config_target['TARGET_ARCH'].to_upper(): 'y' } foreach k, v: disassemblers if config_host['ARCH'].startswith(k) or config_target['TARGET_BASE_ARCH'].startswith(k) @@ -797,6 +798,8 @@ foreach target : target_dirs elif ignored.contains(k) # do nothing elif k == 'TARGET_BASE_ARCH' + # Note that TARGET_BASE_ARCH ends up in config-target.h but it is + # not used to select files from sourcesets. config_target_data.set('TARGET_' + v.to_upper(), 1) elif k == 'TARGET_NAME' or k == 'CONFIG_QEMU_INTERP_PREFIX' config_target_data.set_quoted(k, v) |