diff options
| author | Jason Ekstrand <[email protected]> | 2016-10-20 16:04:16 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-10-21 09:30:23 -0700 |
| commit | 7ea4ef8849c5cc158adbdff1187b91f591552196 (patch) | |
| tree | 5f53def72c4e3d0593da24614a57fcf9e98a7426 /src | |
| parent | d96345de989c8f9a0328cdc3588bfe186154c8ea (diff) | |
anv: Always use the full driver path in the intel_icd.*.json
Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Cc: "13.0" <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 8 | ||||
| -rw-r--r-- | src/intel/vulkan/intel_icd.json.in | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index ca5bf9f7f9e..069e3639011 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -176,15 +176,9 @@ dev_icd.json : dev_icd.json.in -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ < $(srcdir)/dev_icd.json.in > $@ -if VULKAN_ICD_DRIVER_PATH -ICD_DRIVER_PATH="${libdir}/libvulkan_intel.so" -else -ICD_DRIVER_PATH="libvulkan_intel.so" -endif - intel_icd.@[email protected] : intel_icd.json.in $(AM_V_GEN) $(SED) \ - -e "s#@ICD_DRIVER_PATH@#${ICD_DRIVER_PATH}#" \ + -e "s#@install_libdir@#${libdir}#" \ < $(srcdir)/intel_icd.json.in > $@ # Libvulkan with dummy gem. Used for unit tests. diff --git a/src/intel/vulkan/intel_icd.json.in b/src/intel/vulkan/intel_icd.json.in index 4f50866b108..d9b363a9762 100644 --- a/src/intel/vulkan/intel_icd.json.in +++ b/src/intel/vulkan/intel_icd.json.in @@ -1,7 +1,7 @@ { "file_format_version": "1.0.0", "ICD": { - "library_path": "@ICD_DRIVER_PATH@", + "library_path": "@install_libdir@/libvulkan_intel.so", "abi_versions": "1.0.3" } } |