summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2016-03-30 10:30:42 -0700
committerJason Ekstrand <[email protected]>2016-04-14 15:15:00 -0700
commite40b867145160dfb258a6f03c7e6b02f3f839aa4 (patch)
tree28d99564b467d15d4bb08db0b29d05071bb23759
parentca16373a2bedfaf5d5f1b668f080cda91d96171c (diff)
anv/intel_icd: Don't provide an absolute path
The driver will be installed to $(libdir)/libvulkan_intel.so and just providing a driver name is enough for the loader. This also ensures that multi-arch systems work ok.
-rw-r--r--src/intel/vulkan/.gitignore3
-rw-r--r--src/intel/vulkan/intel_icd.json (renamed from src/intel/vulkan/intel_icd.json.in)2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/intel/vulkan/.gitignore b/src/intel/vulkan/.gitignore
index 40afc2e3989..4a683b45487 100644
--- a/src/intel/vulkan/.gitignore
+++ b/src/intel/vulkan/.gitignore
@@ -5,5 +5,4 @@
/wayland-drm-protocol.c
/wayland-drm-client-protocol.h
/dev_icd.json
-/intel_icd.json
-/gen*_pack.h \ No newline at end of file
+/gen*_pack.h
diff --git a/src/intel/vulkan/intel_icd.json.in b/src/intel/vulkan/intel_icd.json
index d9b363a9762..277c14ec444 100644
--- a/src/intel/vulkan/intel_icd.json.in
+++ b/src/intel/vulkan/intel_icd.json
@@ -1,7 +1,7 @@
{
"file_format_version": "1.0.0",
"ICD": {
- "library_path": "@install_libdir@/libvulkan_intel.so",
+ "library_path": "libvulkan_intel.so",
"abi_versions": "1.0.3"
}
}