diff --git a/include/__config b/include/__config
index ced9a953..2f75ed88 100644
--- a/include/__config
+++ b/include/__config
@@ -148,7 +148,7 @@ typedef __char32_t char32_t;
 #define _LIBCPP_HAS_NO_AUTO_TYPE
 #endif
 
-#if __clang_major__ < 3
+#if !(__has_feature(cxx_access_control_sfinae)) || !__has_feature(cxx_trailing_return)
 #define _LIBCPP_HAS_NO_ADVANCED_SFINAE
 #endif