generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build regression caused by not defining ABI library macros

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@222085 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2014-11-15 17:25:23 +00:00
parent 8e2855ce0b
commit 9a1468f79e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -85,15 +85,6 @@ get_target_triple(LIBCXX_TARGET_TRIPLE
set(LIBCXX_TARGET_TRIPLE ${LIBCXX_TARGET_TRIPLE} CACHE STRING "Target triple.") set(LIBCXX_TARGET_TRIPLE ${LIBCXX_TARGET_TRIPLE} CACHE STRING "Target triple.")
# Configure compiler.
include(config-ix)
# Configure ABI library
include(HandleLibCXXABI)
#===============================================================================
# Setup Compiler Flags
#===============================================================================
# Declare libc++ configuration variables. # Declare libc++ configuration variables.
# They are intended for use as follows: # They are intended for use as follows:
# LIBCXX_CXX_FLAGS: General flags for both the compiler and linker. # LIBCXX_CXX_FLAGS: General flags for both the compiler and linker.
@ -103,6 +94,15 @@ set(LIBCXX_CXX_FLAGS "")
set(LIBCXX_COMPILE_FLAGS "") set(LIBCXX_COMPILE_FLAGS "")
set(LIBCXX_LINK_FLAGS "") set(LIBCXX_LINK_FLAGS "")
# Configure compiler.
include(config-ix)
# Configure ABI library
include(HandleLibCXXABI)
#===============================================================================
# Setup Compiler Flags
#===============================================================================
# Get required flags. # Get required flags.
# On all systems the system c++ standard library headers need to be excluded. # On all systems the system c++ standard library headers need to be excluded.
if (MSVC) if (MSVC)

2
cmake/Modules/HandleLibCXXABI.cmake
View File

@ -16,7 +16,7 @@
# in the libc++ build directory. # in the libc++ build directory.
# #
macro(setup_abi_lib abipathvar abidefines abilib abifiles abidirs) macro(setup_abi_lib abipathvar abidefines abilib abifiles abidirs)
list(APPEND LIBCXX_CXX_FEATURE_FLAGS ${abidefines}) list(APPEND LIBCXX_COMPILE_FLAGS ${abidefines})
set(${abipathvar} "${${abipathvar}}" set(${abipathvar} "${${abipathvar}}"
CACHE PATH CACHE PATH
"Paths to C++ ABI header directories separated by ';'." FORCE "Paths to C++ ABI header directories separated by ';'." FORCE