summaryrefslogtreecommitdiffstats
path: root/libcxx/CMakeLists.txt
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2014-11-15 17:25:23 +0000
committerEric Fiselier <eric@efcs.ca>2014-11-15 17:25:23 +0000
commit382338d988c0b33a7feb7a9541f30894d9846be9 (patch)
tree5b19b947eb166722b2f4bf05c184afd202a11043 /libcxx/CMakeLists.txt
parenteb392de411745dec5eece9bfffd4e0c684d8a469 (diff)
downloadbcm5719-llvm-382338d988c0b33a7feb7a9541f30894d9846be9.tar.gz
bcm5719-llvm-382338d988c0b33a7feb7a9541f30894d9846be9.zip
Fix build regression caused by not defining ABI library macros
llvm-svn: 222085
Diffstat (limited to 'libcxx/CMakeLists.txt')
-rw-r--r--libcxx/CMakeLists.txt18
1 files changed, 9 insertions, 9 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 78faefbca67..5fb0f60ad9d 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/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)
OpenPOWER on IntegriCloud