anv: automake: list shared libraries after the static ones
authorEmil Velikov <emil.velikov@collabora.com>
Fri, 19 May 2017 17:43:14 +0000 (18:43 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 29 May 2017 15:42:41 +0000 (16:42 +0100)
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 <lordheavym@gmail.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eduardo Lima Mitev <elima@igalia.com>
src/intel/Makefile.vulkan.am

index ceea6b83278d4a75ca2453f0d058fbc3e282abc3..878abf3f7d3151ccf6176f83290f8bffd7978a6c 100644 (file)
@@ -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)