summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2019-01-16 02:16:57 +0000
committerEric Fiselier <eric@efcs.ca>2019-01-16 02:16:57 +0000
commit01fe12a053c29735af87f9ba78746bb0cdf79abd (patch)
tree815fe7b9be436343180c683a931ddd7ce0147b84
parentede2383b71efecb8a0ca6d3c0481c27fd541f374 (diff)
Attempt to make test_macros.h even more minimallinaro-local/ci/tcwg_kernel/llvm-master-aarch64-lts-allmodconfig
-rw-r--r--libcxx/test/support/test_macros.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h
index 2813d1ff068..e4525353417 100644
--- a/libcxx/test/support/test_macros.h
+++ b/libcxx/test/support/test_macros.h
@@ -11,7 +11,18 @@
#ifndef SUPPORT_TEST_MACROS_HPP
#define SUPPORT_TEST_MACROS_HPP
-#include <ciso646> // Get STL specific macros like _LIBCPP_VERSION
+// Attempt to get STL specific macros like _LIBCPP_VERSION using the most
+// minimal header possible. If we're testing libc++, we should use `<__config>`.
+// If <__config> isn't available, fall back to <ciso646>.
+#ifdef __has_include
+# if __has_include("<__config>")
+# include <__config>
+# define TEST_IMP_INCLUDED_HEADER
+# endif
+#endif
+#ifndef TEST_IMP_INCLUDED_HEADER
+#include <ciso646>
+#endif
#if defined(__GNUC__)
#pragma GCC diagnostic push