diff options
| author | Emil Velikov <[email protected]> | 2014-07-02 12:06:41 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-07-02 12:25:05 +0100 |
| commit | 7414552b1826ece48a622c14b48cad3a37b68025 (patch) | |
| tree | e22d51db7ae0c59593ed813721cfec21f8bfa5d2 /src/gallium/targets/dri | |
| parent | bd322dfd0e6c9a07c4d1516cdb9bd00317542bba (diff) | |
targets/dri: allow duplicated symbols
With the inclusion of xmlconfig in the loader we're providing dri* symbols
which are already available in libdricommon.la. This leads to a build
break due to the multiple definitions.
Temporary allow multiple definitions, until we come with a better solution.
Reported-by: Laurent Carlier <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets/dri')
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 88242a97fa6..cb1206452e4 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -45,6 +45,12 @@ gallium_dri_la_LIBADD = \ if HAVE_GALLIUM_STATIC_TARGETS +# XXX: Temporary allow duplicated symbols, as the loader pulls in xmlconfig.c +# which already provides driParse* and driQuery* amongst others. +# Remove this hack as we come up with a cleaner solution. +gallium_dri_la_LDFLAGS += \ + -Wl,--allow-multiple-definition + MEGADRIVERS = STATIC_TARGET_CPPFLAGS = STATIC_TARGET_LIB_DEPS = \ |