[Mesa-dev] [PATCH 1/3] radv: Fix architecture in radeon_icd.{arch}.json

Chad Versace chadversary at chromium.org
Thu Nov 9 23:45:00 UTC 2017


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 at imgtec.com>
Cc: Dylan Baker <dylan at pnwbakers.com>
---
 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. at 0@.json'.format(target_machine.cpu()),
+  output : 'radeon_icd. at 0@.json'.format(host_machine.cpu()),
   install_dir : with_vulkan_icd_dir,
 )
 configure_file(
-- 
2.13.0



More information about the mesa-dev mailing list