From 44b09b3ad71aa38a25a954719ab8b35b60f27aeb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 5 Dec 2011 18:46:09 +0800 Subject: [PATCH] [V8] uclibc: __GLIBC__ might be defined on uclibc builds Uclibc defines __GLIBC__ becuase it is compatible in some ways with, but it does not provide execinfo. Uclibc provides a define to disable defining __GLIBC__ but Qt does not build with that right now. Check for GLIBC and !UCLIBC here. Change-Id: I582a16d16151f30c696ed0e9d185e2706599abe7 Sanity-Review: Qt Sanity Bot Reviewed-by: Kent Hansen Reviewed-by: Simon Hausmann --- src/3rdparty/v8/src/platform-linux.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/v8/src/platform-linux.cc b/src/3rdparty/v8/src/platform-linux.cc index 90f45dd..451f6fc 100644 --- a/src/3rdparty/v8/src/platform-linux.cc +++ b/src/3rdparty/v8/src/platform-linux.cc @@ -46,7 +46,7 @@ #include // open #include // open #include // sysconf -#ifdef __GLIBC__ +#if defined(__GLIBC__) && !defined(__UCLIBC__) #include // backtrace, backtrace_symbols #endif // def __GLIBC__ #include // index @@ -553,7 +553,7 @@ void OS::SignalCodeMovingGC() { int OS::StackWalk(Vector frames) { // backtrace is a glibc extension. -#ifdef __GLIBC__ +#if defined(__GLIBC__) && !defined(__UCLIBC__) int frames_size = frames.length(); ScopedVector addresses(frames_size); -- 2.7.4