File config/meson.build has logic to move cpu_instruction_set from 'auto'
to 'native' or 'generic'.
When calling get_option('cpu_instruction_set') again from
config/x86/meson.build we get 'auto' again, instead of expected 'native'.
The fix is to not call get_option('cpu_instruction_set') again, just rely
on the work done by config/meson.build and trust that cpu_instruction_set
already has the correct value. Note that getting/processing
cpu_instruction_set is not x86-specific, so should be handled by
config/meson.build.
Fixes: fd8b058b322e ("config/x86: increase lcores for AMD EPYC cross build")
Cc: sta...@dpdk.org
Signed-off-by: Andre Muezerie <andre...@linux.microsoft.com>
---
config/x86/meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/config/x86/meson.build b/config/x86/meson.build
index 47a5b0c04a..a6d917c78c 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -104,7 +104,6 @@ epyc_zen_cores = {
'__znver1__':128
}
-cpu_instruction_set = get_option('cpu_instruction_set')
if cpu_instruction_set == 'native'
foreach m:epyc_zen_cores.keys()
if cc.get_define(m, args: machine_args) != ''
--
2.48.1.vfs.0.0
