[cfe-commits] [libcxx] r172435 - in /libcxx/trunk: CMakeLists.txt include/__config test/lit.cfg

[Howard Hinnant]

Author: hhinnant
Date: Mon Jan 14 11:07:27 2013
New Revision: 172435

URL: http://llvm.org/viewvc/llvm-project?rev=172435&view=rev
Log:
Michael van der Westhuizen:  Patches for Linux.  Fixes http://llvm.org/bugs/show_bug.cgi?id=14648.

Modified:
    libcxx/trunk/CMakeLists.txt
    libcxx/trunk/include/__config
    libcxx/trunk/test/lit.cfg

Modified: libcxx/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=172435&r1=172434&r2=172435&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Mon Jan 14 11:07:27 2013
@@ -70,7 +70,7 @@
   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

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=172435&r1=172434&r2=172435&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Mon Jan 14 11:07:27 2013
@@ -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

Modified: libcxx/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.cfg?rev=172435&r1=172434&r2=172435&view=diff
==============================================================================
--- libcxx/trunk/test/lit.cfg (original)
+++ libcxx/trunk/test/lit.cfg Mon Jan 14 11:07:27 2013
@@ -146,7 +146,7 @@
     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: