<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Mar 12, 2014 at 4:30 AM, Alexey Samsonov <span dir="ltr"><<a href="mailto:samsonov@google.com" target="_blank">samsonov@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr">Hi Saleem,<div><br></div><div>This resurrects the error I tried to fix in r191814. See the error on our buildbot: <a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/7812/steps/build%2064-bit%20llvm%20using%20clang/logs/stdio" target="_blank">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/7812/steps/build%2064-bit%20llvm%20using%20clang/logs/stdio</a></div>
<div>-Werror flag, which is presumably added by add_llvm_definitions() in HandleLLVMOptions.cmake appears *after* -Wno-error added by libcxx CMakeLists.txt. Should we just get rid of add_llvm_definitions()</div><div>in LLVM's CMake files and add a flag to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS variables instead?</div>
</div></blockquote><div><br></div><div>Ah, sorry about that.</div><div><br></div><div>I think that llvm_add_definitions doesn't really add much and removal of it would be a nice cleanup. It seems that the raison d'être for llvm_add_definitions is to track compile flags for llvm-config. A general sweep of llvm_add_definition usage for compiler flags could be replaced with adding to the CMAKE_CXX_FLAGS (and CMAKE_C_FLAGS) and using add_definitions otherwise. Once that is done, simply using the string replace and add_definitions to add a CPP macro for the compile flags would allow us to retain the desired functionality.</div>
<div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div class="gmail_extra"><div><div class="h5">
<div class="gmail_quote">On Wed, Mar 12, 2014 at 8:11 AM, Saleem Abdulrasool <span dir="ltr"><<a href="mailto:compnerd@compnerd.org" target="_blank">compnerd@compnerd.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: compnerd<br>
Date: Tue Mar 11 23:11:28 2014<br>
New Revision: 203637<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=203637&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=203637&view=rev</a><br>
Log:<br>
build: fix add_definition abuse in CMake<br>
<br>
add_definitions is meant for adding C preprocessor definitions. Modern cmake<br>
suggests use of the CMAKE_CXX_FLAGS for the purposes of pushing flags to the<br>
compilation commands. Simply switch to the modern form given that we are<br>
already requiring a new enough cmake.<br>
<br>
Modified:<br>
libcxx/trunk/CMakeLists.txt<br>
<br>
Modified: libcxx/trunk/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=203637&r1=203636&r2=203637&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=203637&r1=203636&r2=203637&view=diff</a><br>
==============================================================================<br>
--- libcxx/trunk/CMakeLists.txt (original)<br>
+++ libcxx/trunk/CMakeLists.txt Tue Mar 11 23:11:28 2014<br>
@@ -259,11 +259,14 @@ if (MSVC)<br>
add_definitions(-D_CRT_SECURE_NO_WARNINGS)<br>
endif()<br>
<br>
-add_definitions(<br>
- ${LIBCXX_CXX_REQUIRED_FLAGS}<br>
- ${LIBCXX_CXX_WARNING_FLAGS}<br>
- ${LIBCXX_CXX_FEATURE_FLAGS}<br>
- )<br>
+string(REPLACE ";" " " LIBCXX_CXX_REQUIRED_FLAGS "${LIBCXX_CXX_REQUIRED_FLAGS}")<br>
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCXX_CXX_REQUIRED_FLAGS}")<br>
+<br>
+string(REPLACE ";" " " LIBCXX_CXX_WARNING_FLAGS "${LIBCXX_CXX_WARNING_FLAGS}")<br>
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCXX_CXX_WARNING_FLAGS}")<br>
+<br>
+string(REPLACE ";" " " LIBCXX_CXX_FEATURE_FLAGS "${LIBCXX_CXX_FEATURE_FLAGS}")<br>
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCXX_CXX_FEATURE_FLAGS}")<br>
<br>
#===============================================================================<br>
# Setup Source Code<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div></div></div><span class=""><font color="#888888">-- <br><div>Alexey Samsonov, MSK</div>
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org
</div></div>