summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2017-11-09 14:55:37 -0800
committerChad Versace <[email protected]>2017-11-09 16:29:28 -0800
commit9ec33972cc15e67b89f94e388f43c5186e4592f0 (patch)
tree3a78271faaad9582bf3ec238be5be6649a663317
parent2a4798ad98b973f8cecad25f2e5cccb9024c9576 (diff)
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 <[email protected]> Reviewed-by: Dylan Baker <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]>
-rw-r--r--src/amd/vulkan/meson.build2
1 files changed, 1 insertions, 1 deletions
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.@[email protected]'.format(target_machine.cpu()),
+ output : 'radeon_icd.@[email protected]'.format(host_machine.cpu()),
install_dir : with_vulkan_icd_dir,
)
configure_file(