forked from mirrors/nixpkgs
44cb95a234
This is very similar to what we had in bb0b0822ef.
The xlocale.h header is no longer existing in glibc version 2.26, so we
need to avoid including it.
I've tested building against all of the libcxx attributes of LLVM 3.5,
3.7, 3.8, 3.9, 4 and 5.
All of them succeeded except version 3.5, which failed because of an
unrelated issue (build of libc++abi has failed, one of its
dependencies), so I only verified whether the patch applies cleanly.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @vcunat
20 lines
796 B
Diff
20 lines
796 B
Diff
diff --git a/include/__locale b/include/__locale
|
|
index f4882de..29443b4 100644
|
|
--- a/include/__locale
|
|
+++ b/include/__locale
|
|
@@ -34,12 +34,12 @@
|
|
# include <support/solaris/xlocale.h>
|
|
#elif defined(_NEWLIB_VERSION)
|
|
# include <support/newlib/xlocale.h>
|
|
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
|
|
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|
|
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
|
|
# include <xlocale.h>
|
|
#elif defined(_LIBCPP_HAS_MUSL_LIBC)
|
|
# include <support/musl/xlocale.h>
|
|
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
|
|
+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
|
|
|
|
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
|
#pragma GCC system_header
|