Michael van der Westhuizen: Patches for Linux. Fixes http://llvm.org/bugs/show_bug.cgi?id=14648.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@172435 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
f619e230cc
commit
750039f50c
@ -70,7 +70,7 @@ if ("${LIBCXX_CXX_ABI}" STREQUAL "libsupc++")
|
|||||||
set(LIBCXX_LIBSUPCXX_INCLUDE_PATHS "${LIBCXX_LIBSUPCXX_INCLUDE_PATHS}"
|
set(LIBCXX_LIBSUPCXX_INCLUDE_PATHS "${LIBCXX_LIBSUPCXX_INCLUDE_PATHS}"
|
||||||
CACHE STRINGS
|
CACHE STRINGS
|
||||||
"Paths to libsupc++ include directories separate by ';'.")
|
"Paths to libsupc++ include directories separate by ';'.")
|
||||||
set(LIBCXX_CXX_ABI_LIBRARIES stdc++)
|
set(LIBCXX_CXX_ABI_LIBRARIES supc++)
|
||||||
set(LIBCXX_LIBSUPCXX_FILES
|
set(LIBCXX_LIBSUPCXX_FILES
|
||||||
cxxabi.h
|
cxxabi.h
|
||||||
bits/c++config.h
|
bits/c++config.h
|
||||||
|
@ -66,6 +66,12 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
|
# if defined(__GNUC__) && _GNUC_VER >= 403
|
||||||
|
# define _LIBCP_HAS_IS_BASE_OF
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __sun__
|
#ifdef __sun__
|
||||||
# include <sys/isa_defs.h>
|
# include <sys/isa_defs.h>
|
||||||
# ifdef _LITTLE_ENDIAN
|
# ifdef _LITTLE_ENDIAN
|
||||||
|
@ -146,7 +146,7 @@ else:
|
|||||||
cxx_has_stdcxx0x_flag = getattr(config, 'cxx_has_stdcxx0x_flag', True)
|
cxx_has_stdcxx0x_flag = getattr(config, 'cxx_has_stdcxx0x_flag', True)
|
||||||
|
|
||||||
# Configure extra compiler flags.
|
# 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']
|
library_paths = ['-L' + libcxx_obj_root + '/lib']
|
||||||
compile_flags = []
|
compile_flags = []
|
||||||
if cxx_has_stdcxx0x_flag:
|
if cxx_has_stdcxx0x_flag:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user