radv: Fix architecture in radeon_icd.{arch}.json
authorChad Versace <chadversary@chromium.org>
Thu, 9 Nov 2017 22:55:37 +0000 (14:55 -0800)
committerChad Versace <chadversary@chromium.org>
Fri, 10 Nov 2017 00:29:28 +0000 (16:29 -0800)
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 <eric.engestrom@imgtec.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
src/amd/vulkan/meson.build

index 305a2f6..9399735 100644 (file)
@@ -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(