[libcxx] r222085 - Fix build regression caused by not defining ABI library macros

[Eric Fiselier]

Author: ericwf
Date: Sat Nov 15 11:25:23 2014
New Revision: 222085

URL: http://llvm.org/viewvc/llvm-project?rev=222085&view=rev
Log:
Fix build regression caused by not defining ABI library macros

Modified:
    libcxx/trunk/CMakeLists.txt
    libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake

Modified: libcxx/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=222085&r1=222084&r2=222085&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Sat Nov 15 11:25:23 2014
@@ -85,15 +85,6 @@ get_target_triple(LIBCXX_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.
 # They are intended for use as follows:
 # 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_LINK_FLAGS "")
 
+# Configure compiler.
+include(config-ix)
+# Configure ABI library
+include(HandleLibCXXABI)
+
+#===============================================================================
+# Setup Compiler Flags
+#===============================================================================
+
 # Get required flags.
 # On all systems the system c++ standard library headers need to be excluded.
 if (MSVC)

Modified: libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake?rev=222085&r1=222084&r2=222085&view=diff
==============================================================================
--- libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake (original)
+++ libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake Sat Nov 15 11:25:23 2014
@@ -16,7 +16,7 @@
 #               in the libc++ build directory.
 #
 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}}"
     CACHE PATH
     "Paths to C++ ABI header directories separated by ';'." FORCE