This patch allows building asm for x86 on x86_64 cross compiles
Fixes: 2d62fc064652 ("meson: disable x86 asm in fewer cases.")
Signed-off-by: Mike Lothian <m...@fireburn.co.uk>
---
If you're happy with this change, please can you commit it as I don't
have access
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 4d4ca5d557..9f2d836e80 100644
--- a/meson.build
+++ b/meson.build
@@ -846,7 +846,7 @@ endif
# TODO: it should be possible to use an exe_wrapper to run the binary during
# the build.
if meson.is_cross_build()
- if not (build_machine.cpu_family() == 'x86_64' and host_machine.cpu_family()
== 'x86'
+ if not (build_machine.cpu_family() == 'x86' and host_machine.cpu_family() ==
'x86'
and build_machine.system() == host_machine.system())
message('Cross compiling to x86 from non-x86, disabling asm')
with_asm = false
--
2.17.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
