diff options
author | Anthony G. Basile <[email protected]> | 2013-05-28 22:58:10 +0000 |
---|---|---|
committer | Brian Paul <[email protected]> | 2013-05-29 08:32:35 -0600 |
commit | 22f1add9687ac272bc731b6612bfee50bdbf2f7e (patch) | |
tree | 08b6e39c818154f96de2bd28d0f4459e8f052d27 | |
parent | 4dea6cf21557bcd3bbab3402e19e19f665d7e177 (diff) |
gallium: fix build on uclibc system
execinfo.h and debug_symbol_name_glibc() are pure GNU-isms and do not
build on uclibc systems. A previous patch addressed this issue, but
there was an error. This patch corrects that error. See
https://bugs.freedesktop.org/show_bug.cgi?id=51782
https://bugs.gentoo.org/show_bug.cgi?id=469768
Signed-off-by: Anthony G. Basile <[email protected]>
Signed-off-by: Brian Paul <[email protected]>
-rw-r--r-- | src/gallium/auxiliary/util/u_debug_symbol.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c index 3d2f8ebc31b..0ef111c3b24 100644 --- a/src/gallium/auxiliary/util/u_debug_symbol.c +++ b/src/gallium/auxiliary/util/u_debug_symbol.c @@ -151,10 +151,8 @@ debug_symbol_name_dbghelp(const void *addr, char* buf, unsigned size) } #endif -#ifdef __GLIBC__ -#ifndef __UCLIBC__ +#if defined(__GLIBC__) && !defined(__UCLIBC__) #include <execinfo.h> -#endif /* This can only provide dynamic symbols, or binary offsets into a file. * @@ -179,7 +177,7 @@ debug_symbol_name(const void *addr, char* buf, unsigned size) return; #endif -#ifdef __GLIBC__ +#if defined(__GLIBC__) && !defined(__UCLIBC__) debug_symbol_name_glibc(addr, buf, size); if(buf[0]) return; |