meson: skip asm check when asm is disabled
authorEric Engestrom <eric.engestrom@intel.com>
Thu, 29 Nov 2018 11:50:30 +0000 (11:50 +0000)
committerEric Engestrom <eric.engestrom@intel.com>
Tue, 4 Dec 2018 16:22:51 +0000 (16:22 +0000)
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
meson.build

index df9043e03fd8a1a1132b8ea0cb5ce130df5d28e7..1aeef95f7229545d1941fc98ca202ba144c06ff6 100644 (file)
@@ -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.')