diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78faefbca..5fb0f60ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake
index ff830d5f2..4d2a8691d 100644
--- a/cmake/Modules/HandleLibCXXABI.cmake
+++ b/cmake/Modules/HandleLibCXXABI.cmake
@@ -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