From: Chad Versace Date: Thu, 9 Nov 2017 23:02:13 +0000 (-0800) Subject: anv: Fix architecture in intel_icd.{arch}.json X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b7441ef25288c669adcbe8708a458ceea13b8ff9;p=mesa.git anv: Fix architecture in intel_icd.{arch}.json Use the host arch, not the target arch. In Meson and in recent Autotools, the host arch is where the binary will be used. The target arch is useful only when compiling a compiler. See: http://mesonbuild.com/Cross-compilation.html See: https://www.gnu.org/software/automake/manual/html_node/Cross_002dCompilation.html Reported-by: Eric Engestrom Reviewed-by: Dylan Baker --- diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index ff24e304ef5..debdcce4ef2 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -38,7 +38,7 @@ anv_extensions_c = custom_target( intel_icd = custom_target( 'intel_icd', input : 'anv_icd.py', - output : 'intel_icd.@0@.json'.format(target_machine.cpu()), + output : 'intel_icd.@0@.json'.format(host_machine.cpu()), command : [prog_python2, '@INPUT@', '--lib-path', join_paths(get_option('prefix'), get_option('libdir')), '--out', '@OUTPUT@'],