diff options
| author | Emil Velikov <[email protected]> | 2017-04-13 19:36:56 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-04 18:11:37 +0100 |
| commit | 51accecce7755be9b7eb1baadaec7e4b7d1011af (patch) | |
| tree | 2b9f7b053522e466ccf48face717b89548f3a1d6 | |
| parent | 79a26b663acdffc3f21d6e37f3334495aed16ae5 (diff) | |
mesa/dri: always link against shared glapi
Analogous to previous commit. Check with the extensive commit
description and bug report referenced.
Cc: [email protected]
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.am | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am index 1c6dd08a85d..fb0fc3258bf 100644 --- a/src/mesa/drivers/dri/Makefile.am +++ b/src/mesa/drivers/dri/Makefile.am @@ -6,12 +6,9 @@ MEGADRIVERS_DEPS = SUBDIRS+=common -# On Android, we need to explicitly link to libglapi.so. -if HAVE_ANDROID if HAVE_SHARED_GLAPI SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la endif -endif if HAVE_I915_DRI SUBDIRS += i915 @@ -59,10 +56,15 @@ driinclude_HEADERS = \ nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp mesa_dri_drivers_la_SOURCES = mesa_dri_drivers_la_LDFLAGS = \ - -module -avoid-version -shared -shrext .so \ - $(BSYMBOLIC) \ - $(GC_SECTIONS) \ - $() + -shared \ + -shrext .so \ + -module \ + -no-undefined \ + -avoid-version \ + $(BSYMBOLIC) \ + $(GC_SECTIONS) \ + $(LD_NO_UNDEFINED) + mesa_dri_drivers_la_LIBADD = \ ../../libmesa.la \ common/libmegadriver_stub.la \ |