diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp
index cad37487..94cce3a5 100644
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -256,11 +256,10 @@
 #  define BOOST_NO_CXX14_BINARY_LITERALS
 #endif
 
-#if !__has_feature(__cxx_decltype_auto__)
-#if (__clang_major__ > 3)
+#if !__has_feature(__cxx_decltype_auto__) && (__clang_major__ > 3)
+// This fails with debug info enabled for clang 3.5:
 #  define BOOST_NO_CXX14_DECLTYPE_AUTO
 #endif
-#endif
 
 #if !__has_feature(__cxx_aggregate_nsdmi__)
 #  define BOOST_NO_CXX14_AGGREGATE_NSDMI