gallium/dri targets: use DRI_DRIVER_LDFLAGS
which contains -Wl,-Bsymbolic. If I understand it correctly, it prevents symbols from clashing if multiple drivers are loaded at the same time. Tested-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
@@ -39,7 +39,7 @@ AM_CPPFLAGS = \
|
||||
dridir = $(DRI_DRIVER_INSTALL_DIR)
|
||||
dri_LTLIBRARIES = kgsl_dri.la msm_dri.la
|
||||
|
||||
COMMON_LDFLAGS = -module -avoid-version -shared -no-undefined
|
||||
COMMON_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
|
||||
|
||||
COMMON_LIBADD = \
|
||||
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
|
||||
|
||||
@@ -42,7 +42,7 @@ dri_LTLIBRARIES = i915_dri.la
|
||||
|
||||
i915_dri_la_SOURCES = target.c
|
||||
|
||||
i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
|
||||
i915_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
|
||||
|
||||
i915_dri_la_LIBADD = \
|
||||
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
|
||||
|
||||
@@ -42,7 +42,7 @@ noinst_LTLIBRARIES = ilo_dri.la
|
||||
ilo_dri_la_SOURCES = target.c
|
||||
|
||||
# need -rpath to create a noinst shared library
|
||||
ilo_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined \
|
||||
ilo_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) \
|
||||
-rpath $(abs_builddir)
|
||||
|
||||
ilo_dri_la_LIBADD = \
|
||||
|
||||
@@ -41,7 +41,7 @@ dri_LTLIBRARIES = nouveau_dri.la
|
||||
nodist_EXTRA_nouveau_dri_la_SOURCES = dummy.cpp
|
||||
nouveau_dri_la_SOURCES = target.c
|
||||
|
||||
nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
|
||||
nouveau_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
|
||||
|
||||
nouveau_dri_la_LIBADD = \
|
||||
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
|
||||
|
||||
@@ -47,7 +47,7 @@ swrast_dri_la_SOURCES = \
|
||||
$(top_srcdir)/src/mesa/drivers/dri/common/drisw_util.c \
|
||||
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
|
||||
|
||||
swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
|
||||
swrast_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
|
||||
|
||||
swrast_dri_la_LIBADD = \
|
||||
$(top_builddir)/src/mesa/libmesagallium.la \
|
||||
|
||||
@@ -42,7 +42,7 @@ vmwgfx_dri_la_SOURCES = \
|
||||
target.c \
|
||||
vmw_powf.c
|
||||
|
||||
vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
|
||||
vmwgfx_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
|
||||
|
||||
vmwgfx_dri_la_LIBADD = \
|
||||
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
|
||||
|
||||
@@ -44,7 +44,7 @@ nodist_EXTRA_r300_dri_la_SOURCES = dummy.cpp
|
||||
r300_dri_la_SOURCES = \
|
||||
../drm_target.c
|
||||
|
||||
r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
|
||||
r300_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
|
||||
|
||||
r300_dri_la_LIBADD = \
|
||||
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
|
||||
|
||||
@@ -43,7 +43,7 @@ dri_LTLIBRARIES = r600_dri.la
|
||||
r600_dri_la_SOURCES = \
|
||||
../drm_target.c
|
||||
|
||||
r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
|
||||
r600_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
|
||||
|
||||
r600_dri_la_LIBADD = \
|
||||
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
|
||||
|
||||
@@ -44,7 +44,7 @@ nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp
|
||||
radeonsi_dri_la_SOURCES = \
|
||||
../drm_target.c
|
||||
|
||||
radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
|
||||
radeonsi_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
|
||||
|
||||
radeonsi_dri_la_LIBADD = \
|
||||
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
|
||||
|
||||
Reference in New Issue
Block a user