From 4b4b1760b5b06adebb8770c8febed97c47848871 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 14 Apr 2015 00:54:30 -0700 Subject: [PATCH] v8: cherry-pick uclibc build patch from upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit log follows: Restore V8_LIBC_UCLIBC as a libc option. As uClibc defines __GLIBC__ in an attempt to look like glibc, V8_LIBC_GLIBC was true for uClibc as well. Checking for uClibc before glibc fixes this and restores the correct behavior. Review URL: https://codereview.chromium.org/1066573005 Fixes: https://github.com/nodejs/io.js/issues/1432 PR-URL: https://github.com/nodejs/io.js/pull/1974 Reviewed-By: Johan Bergström Reviewed-By: Rod Vagg --- deps/v8/include/v8config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deps/v8/include/v8config.h b/deps/v8/include/v8config.h index f9c3ffde17cf7a..ca806cbd2471ed 100644 --- a/deps/v8/include/v8config.h +++ b/deps/v8/include/v8config.h @@ -124,6 +124,7 @@ // V8_LIBC_BIONIC - Bionic libc // V8_LIBC_BSD - BSD libc derivate // V8_LIBC_GLIBC - GNU C library +// V8_LIBC_UCLIBC - uClibc // // Note that testing for libc must be done using #if not #ifdef. For example, // to test for the GNU C library, use: @@ -136,6 +137,9 @@ #elif defined(__BIONIC__) # define V8_LIBC_BIONIC 1 # define V8_LIBC_BSD 1 +#elif defined(__UCLIBC__) +// Must test for UCLIBC before GLIBC, as UCLIBC pretends to be GLIBC. +# define V8_LIBC_UCLIBC 1 #elif defined(__GLIBC__) || defined(__GNU_LIBRARY__) # define V8_LIBC_GLIBC 1 #else