Author: compnerd
Date: Tue Mar 11 23:11:31 2014
New Revision: 203638
URL: http://llvm.org/viewvc/llvm-project?rev=203638&view=rev
Log:
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.
Modified:
libcxx/trunk/CMakeLists.txt
Modified: libcxx/trunk/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=203638&r1=203637&r2=203638&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Tue Mar 11 23:11:31 2014
@@ -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)
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
