From 9ec33972cc15e67b89f94e388f43c5186e4592f0 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Thu, 9 Nov 2017 14:55:37 -0800 Subject: [PATCH] radv: Fix architecture in radeon_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 Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 305a2f66f58..93997350a25 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -130,7 +130,7 @@ radv_data.set('libvulkan_radeon_path', libvulkan_radeon.full_path()) configure_file( configuration : radv_data, input : 'radeon_icd.json.in', - output : 'radeon_icd.@0@.json'.format(target_machine.cpu()), + output : 'radeon_icd.@0@.json'.format(host_machine.cpu()), install_dir : with_vulkan_icd_dir, ) configure_file( -- 2.30.2