From 03e6dbbc05a61c8f9ebb641ed41fce13bc12392e Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 12 Mar 2014 04:11:31 +0000 Subject: [PATCH] build: fix erroneous overwriting of flags Always use list(APPEND) as it will perform the desired action even if the list is empty or previously unset. The first set is harmless, however, the subsequent set was overwriting the previous flag setup resulting in an improper compilation command being generated. This manifested as a build failure on Linux when using cmake + ninja. llvm-svn: 203638 --- libcxx/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 677abaa600ca..dd36b6163813 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -180,7 +180,7 @@ if (MSVC) # headers. else() if (LIBCXX_HAS_NOSTDINCXX_FLAG) - set(LIBCXX_CXX_REQUIRED_FLAGS -nostdinc++) + list(APPEND LIBCXX_CXX_REQUIRED_FLAGS -nostdinc++) endif() if (LIBCXX_ENABLE_CXX0X AND LIBCXX_HAS_STDCXX0X_FLAG) list(APPEND LIBCXX_CXX_REQUIRED_FLAGS -std=c++0x) @@ -196,7 +196,7 @@ endmacro() # Get warning flags if (NOT MSVC) append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_WALL_FLAG -Wall) - set(LIBCXX_CXX_REQUIRED_FLAGS -Werror=return-type) + list(APPEND LIBCXX_CXX_REQUIRED_FLAGS -Werror=return-type) endif() append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_W_FLAG -W)