From: Emil Velikov Date: Fri, 19 May 2017 17:43:14 +0000 (+0100) Subject: anv: automake: list shared libraries after the static ones X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3e8790bff096a1a56bd1a3046c556a7f93b68ca8;p=mesa.git 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 --- diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am index ceea6b83278..878abf3f7d3 100644 --- a/src/intel/Makefile.vulkan.am +++ b/src/intel/Makefile.vulkan.am @@ -111,7 +111,21 @@ VULKAN_SOURCES = \ $(VULKAN_GENERATED_FILES) \ $(VULKAN_FILES) -VULKAN_LIB_DEPS = $(LIBDRM_LIBS) +VULKAN_LIB_DEPS = \ + vulkan/libvulkan_common.la \ + $(VULKAN_PER_GEN_LIBS) \ + compiler/libintel_compiler.la \ + common/libintel_common.la \ + isl/libisl.la \ + blorp/libblorp.la \ + $(top_builddir)/src/vulkan/libvulkan_util.la \ + $(top_builddir)/src/vulkan/libvulkan_wsi.la \ + $(top_builddir)/src/compiler/nir/libnir.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(LIBDRM_LIBS) \ + $(PTHREAD_LIBS) \ + $(DLOPEN_LIBS) \ + -lm if HAVE_PLATFORM_X11 VULKAN_CPPFLAGS += \ @@ -140,21 +154,6 @@ vulkan_libvulkan_common_la_SOURCES = $(VULKAN_SOURCES) vulkan_libvulkan_common_la_CFLAGS = $(VULKAN_CFLAGS) vulkan_libvulkan_common_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -VULKAN_LIB_DEPS += \ - vulkan/libvulkan_common.la \ - $(VULKAN_PER_GEN_LIBS) \ - compiler/libintel_compiler.la \ - common/libintel_common.la \ - isl/libisl.la \ - blorp/libblorp.la \ - $(top_builddir)/src/vulkan/libvulkan_util.la \ - $(top_builddir)/src/vulkan/libvulkan_wsi.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) \ - -lm - nodist_EXTRA_vulkan_libvulkan_intel_la_SOURCES = dummy.cpp vulkan_libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES) vulkan_libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS)