From b196e01edc0d8eeeebed347fe0dbf4fc247d821b Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 19 May 2017 18:43:14 +0100 Subject: [PATCH] anv: automake: list shared libraries after the static ones The compiler can discard the shared ones from the link chain, since there is no user (the static libraries) before it on the command line. Cc: mesa-stable@lists.freedesktop.org Reported-by: Laurent Carlier Signed-off-by: Emil Velikov Reviewed-by: Eduardo Lima Mitev (cherry picked from commit 3e8790bff096a1a56bd1a3046c556a7f93b68ca8) --- src/intel/vulkan/Makefile.am | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 95f276ed7e1..ec2d175441d 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -93,7 +93,20 @@ VULKAN_SOURCES = \ $(VULKAN_GENERATED_FILES) \ $(VULKAN_FILES) -VULKAN_LIB_DEPS = +VULKAN_LIB_DEPS = \ + libvulkan_common.la \ + $(top_builddir)/src/vulkan/wsi/libvulkan_wsi.la \ + $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \ + $(top_builddir)/src/compiler/nir/libnir.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(top_builddir)/src/intel/common/libintel_common.la \ + $(top_builddir)/src/intel/isl/libisl.la \ + $(top_builddir)/src/intel/blorp/libblorp.la \ + $(PER_GEN_LIBS) \ + $(PTHREAD_LIBS) \ + $(DLOPEN_LIBS) \ + -lm + if HAVE_PLATFORM_X11 AM_CPPFLAGS += \ @@ -123,20 +136,6 @@ endif noinst_LTLIBRARIES += libvulkan_common.la libvulkan_common_la_SOURCES = $(VULKAN_SOURCES) -VULKAN_LIB_DEPS += \ - libvulkan_common.la \ - $(top_builddir)/src/vulkan/wsi/libvulkan_wsi.la \ - $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(top_builddir)/src/intel/common/libintel_common.la \ - $(top_builddir)/src/intel/isl/libisl.la \ - $(top_builddir)/src/intel/blorp/libblorp.la \ - $(PER_GEN_LIBS) \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) \ - -lm - nodist_EXTRA_libvulkan_intel_la_SOURCES = dummy.cpp libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES)