diff options
| -rw-r--r-- | libcxx/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libcxx/include/__config | 6 | ||||
| -rw-r--r-- | libcxx/test/lit.cfg | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 663467e7867..b793e6ec54e 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -70,7 +70,7 @@ if ("${LIBCXX_CXX_ABI}" STREQUAL "libsupc++") set(LIBCXX_LIBSUPCXX_INCLUDE_PATHS "${LIBCXX_LIBSUPCXX_INCLUDE_PATHS}" CACHE STRINGS "Paths to libsupc++ include directories separate by ';'.") - set(LIBCXX_CXX_ABI_LIBRARIES stdc++) + set(LIBCXX_CXX_ABI_LIBRARIES supc++) set(LIBCXX_LIBSUPCXX_FILES cxxabi.h bits/c++config.h diff --git a/libcxx/include/__config b/libcxx/include/__config index 203be7616cc..8617b866842 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -66,6 +66,12 @@ # endif #endif // _WIN32 +#ifdef __linux__ +# if defined(__GNUC__) && _GNUC_VER >= 403 +# define _LIBCP_HAS_IS_BASE_OF +# endif +#endif + #ifdef __sun__ # include <sys/isa_defs.h> # ifdef _LITTLE_ENDIAN diff --git a/libcxx/test/lit.cfg b/libcxx/test/lit.cfg index 8121da13dd0..512935c3ecb 100644 --- a/libcxx/test/lit.cfg +++ b/libcxx/test/lit.cfg @@ -146,7 +146,7 @@ else: cxx_has_stdcxx0x_flag = getattr(config, 'cxx_has_stdcxx0x_flag', True) # Configure extra compiler flags. -include_paths = ['-I' + libcxx_src_root + '/include'] +include_paths = ['-I' + libcxx_src_root + '/include', '-I' + libcxx_src_root + '/test/support'] library_paths = ['-L' + libcxx_obj_root + '/lib'] compile_flags = [] if cxx_has_stdcxx0x_flag: |
