Mesa (master): st/egl: do not link against libloader
Emil Velikov
evelikov at kemper.freedesktop.org
Thu May 29 19:02:00 UTC 2014
Module: Mesa
Branch: master
Commit: febec731475a5b288cc50660b2d32780e395b950
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=febec731475a5b288cc50660b2d32780e395b950
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed May 28 15:43:35 2014 +0100
st/egl: do not link against libloader
Move the link to the final targets, like any other place in
mesa/gallium. This allows better visibilty and will prevent
us from including the library archive twice.
Resolves multiple definition of `loader_get_pci_id_for_fd'
multiple definition of `loader_get_pci_id_for_fd'
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79263
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79382
Cc: Chia-I Wu <olv at lunarg.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Chia-I Wu <olv at lunarg.com>
Tested-by: Michel Dänzer <michel.daenzer at amd.com>
---
src/gallium/state_trackers/egl/Makefile.am | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
index 26266ed..b7dcdab 100644
--- a/src/gallium/state_trackers/egl/Makefile.am
+++ b/src/gallium/state_trackers/egl/Makefile.am
@@ -65,7 +65,6 @@ endif
if HAVE_EGL_PLATFORM_DRM
libegl_la_SOURCES += $(drm_FILES)
-libegl_la_LIBADD = $(top_builddir)/src/loader/libloader.la
AM_CFLAGS += \
$(LIBDRM_CFLAGS)
AM_CPPFLAGS += \
More information about the mesa-commit
mailing list