From 3eed8388b49d5d3cbc2db74fee1b017eb4b40d0a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Sep 2017 10:06:24 -0700 Subject: [PATCH] Use __GLIBC__ to control use of gnu_get_libc_version Signed-off-by: Khem Raj --- Upstream-Status: Pending src/mongo/util/processinfo_linux.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: git/src/mongo/util/processinfo_linux.cpp =================================================================== --- git.orig/src/mongo/util/processinfo_linux.cpp +++ git/src/mongo/util/processinfo_linux.cpp @@ -44,10 +44,10 @@ #include #ifdef __BIONIC__ #include -#elif __UCLIBC__ -#include -#else +#elif defined(__GLIBC__) && !defined(__UCLIBC__) #include +#else +#include #endif #include @@ -503,7 +503,7 @@ void ProcessInfo::SystemInfo::collectSys stringstream ss; ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; bExtra.append("libcVersion", ss.str()); -#else +#elif defined(__GLIBC__) bExtra.append("libcVersion", gnu_get_libc_version()); #endif if (!verSig.empty())