diff options
| author | Alexandre Demers <[email protected]> | 2017-05-25 21:09:00 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2017-05-26 09:29:44 -0600 |
| commit | a958a30827aebd17471c0933695e68ad1c1c6ff0 (patch) | |
| tree | b042a461741a2b067441400068383957d1fc6ed9 /src | |
| parent | 726b68ad822ba07ec042c6d175208f49af8cf248 (diff) | |
osmesa: link with libunwind if enabled (v2)
Fixes linking error in libOSmesa when using libunwind.
CXXLD libOSMesa.la
src/gallium/auxiliary/.libs/libgallium.a(u_debug_stack.o): In function `symbol_name_cached':
./src/gallium/auxiliary/util/u_debug_stack.c:87: undefined reference to `_ULx86_64_get_proc_name'
src/gallium/auxiliary/.libs/libgallium.a(u_debug_stack.o): In function `debug_backtrace_capture':
./src/gallium/auxiliary/util/u_debug_stack.c:114: undefined reference to `_Ux86_64_getcontext'
./src/gallium/auxiliary/util/u_debug_stack.c:115: undefined reference to `_ULx86_64_init_local'
./src/gallium/auxiliary/util/u_debug_stack.c:117: undefined reference to `_ULx86_64_step'
./src/gallium/auxiliary/util/u_debug_stack.c:123: undefined reference to `_ULx86_64_get_reg'
./src/gallium/auxiliary/util/u_debug_stack.c:124: undefined reference to `_ULx86_64_get_proc_info'
./src/gallium/auxiliary/util/u_debug_stack.c:120: undefined reference to `_ULx86_64_step'
collect2: error: ld returned 1 exit status
v2 : Fixes title and adds the original error it is fixing.
Signed-off-by: Alexandre Demers <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/targets/osmesa/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am index 6d340f1d92c..2b4af57d5be 100644 --- a/src/gallium/targets/osmesa/Makefile.am +++ b/src/gallium/targets/osmesa/Makefile.am @@ -66,7 +66,8 @@ lib@OSMESA_LIB@_la_LIBADD = \ $(top_builddir)/src/mapi/glapi/libglapi.la \ $(SHARED_GLAPI_LIB) \ $(OSMESA_LIB_DEPS) \ - $(CLOCK_LIB) + $(CLOCK_LIB) \ + $(LIBUNWIND_LIBS) if HAVE_GALLIUM_LLVM AM_CPPFLAGS += -DGALLIUM_LLVMPIPE |