When building for generic distribution we need a stable baseline
architecture, or depending on the build worker the result will vary.
Force the default flags if the user explicitly sets machine=default
at configuration time.
Fixes: b1d48c41189a ("build: support ARM with meson")
Cc: [email protected]
Signed-off-by: Luca Boccassi <[email protected]>
Acked-by: Bruce Richardson <[email protected]>
---
v2: fix typo in commit message, remove variable used only once
config/arm/meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index dae55d6b2..f15ef6385 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -105,7 +105,11 @@ else
cmd_generic = ['generic', '', '', 'default', '']
cmd_output = cmd_generic # Set generic by default
machine_args = [] # Clear previous machine args
- if not meson.is_cross_build()
+ if machine == 'default' and not meson.is_cross_build()
+ machine = impl_generic
+ cmd_output = cmd_generic
+ impl_pn = 'default'
+ elif not meson.is_cross_build()
# The script returns ['Implementer', 'Variant', 'Architecture',
# 'Primary Part number', 'Revision']
detect_vendor = find_program(join_paths(
--
2.20.1
