[Mesa-dev] [PATCH 2/2] egl-static: resolve library linking

[Emil Velikov]

With DRM_PLATFORM libloader.la in linked into libEGL pleading
to multiple defition of the loader* symbols. For every other
platform we need to explicitly link against it.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79263
Cc: José Fonseca <jfonseca at vmware.com>
Cc: Chia-I Wu <olv at lunarg.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/targets/egl-static/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index f4990ad..224ed95 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -66,7 +66,6 @@ egl_gallium_la_SOURCES = \
 	egl_st.c
 
 egl_gallium_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
 	$(top_builddir)/src/gallium/drivers/identity/libidentity.la \
 	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
@@ -100,6 +99,9 @@ AM_CPPFLAGS += $(LIBDRM_CFLAGS)
 egl_gallium_la_LIBADD += \
 	$(top_builddir)/src/gbm/libgbm.la \
 	$(LIBDRM_LIBS)
+else
+egl_gallium_la_LIBADD += \
+	$(top_builddir)/src/loader/libloader.la
 endif
 
 if HAVE_EGL_PLATFORM_FBDEV
-- 
1.9.3