Mesa (master): radv: move AMDGPU_LIBS later in the link chain

Emil Velikov evelikov at kemper.freedesktop.org
Fri Oct 14 10:09:40 UTC 2016


Module: Mesa
Branch: master
Commit: 3fd0cafc1c04b35707e9f862d07edd0599fe18fa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3fd0cafc1c04b35707e9f862d07edd0599fe18fa

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Oct 12 19:05:32 2016 +0100

radv: move AMDGPU_LIBS later in the link chain

At the moment (albeit unlikely) one could get link-time issues, since
libdrm_amdgpu.so is before it's users in the link chain.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>
Acked-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
index b6f3d00..e2f5c02 100644
--- a/src/amd/vulkan/Makefile.am
+++ b/src/amd/vulkan/Makefile.am
@@ -58,7 +58,7 @@ VULKAN_SOURCES = \
 	$(VULKAN_GENERATED_FILES) \
 	$(VULKAN_FILES)
 
-VULKAN_LIB_DEPS = $(AMDGPU_LIBS)
+VULKAN_LIB_DEPS =
 
 
 if HAVE_PLATFORM_X11
@@ -100,6 +100,7 @@ VULKAN_LIB_DEPS += \
 	$(LLVM_LIBS) \
 	$(LIBELF_LIBS) \
 	$(PTHREAD_LIBS) \
+	$(AMDGPU_LIBS) \
 	$(LIBDRM_LIBS) \
 	$(PTHREAD_LIBS) \
 	$(DLOPEN_LIBS) \




More information about the mesa-commit mailing list