Index: libraries/source/nvtt/src/src/nvmath/nvmath.h
===================================================================
--- libraries/source/nvtt/src/src/nvmath/nvmath.h
+++ libraries/source/nvtt/src/src/nvmath/nvmath.h
@@ -130,10 +130,8 @@
 {
 #if NV_OS_WIN32
        return _isnan(f) != 0;
-#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD
+#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD || NV_OS_LINUX
        return isnan(f);
-#elif NV_OS_LINUX
-       return isnanf(f);
 #else
 #      error "isNan not supported"
 #endif
Index: source/third_party/cppformat/format.cpp
===================================================================
--- source/third_party/cppformat/format.cpp
+++ source/third_party/cppformat/format.cpp
@@ -432,7 +432,7 @@
     int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT(true) {
   assert(buffer != 0 && buffer_size != 0);
   int result = 0;
-#if defined(_GNU_SOURCE) && !defined(__BIONIC__)
+#if defined(_GNU_SOURCE) && defined(__GLIBC__)
   char *message = strerror_r(error_code, buffer, buffer_size);
   // If the buffer is full then the message is probably truncated.
   if (message == buffer && strlen(buffer) == buffer_size - 1)