Mesa (master): meson: skip asm check when asm is disabled

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a0b14c1b0255578fdabf8492295e74124d5862ed
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0b14c1b0255578fdabf8492295e74124d5862ed

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Thu Nov 29 11:50:30 2018 +0000

meson: skip asm check when asm is disabled

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index df9043e03f..1aeef95f72 100644
--- a/meson.build
+++ b/meson.build
@@ -917,7 +917,7 @@ endif
 # case of cross compiling where we can use asm, and that's x86_64 -> x86 when
 # host OS == build OS, since in that case the build machine can run the host's
 # binaries.
-if meson.is_cross_build() 
+if with_asm and meson.is_cross_build()
   if build_machine.system() != host_machine.system()
     # TODO: It may be possible to do this with an exe_wrapper (like wine).
     message('Cross compiling from one OS to another, disabling assembly.')