<div dir="ltr">Sorry, and thanks!</div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jul 23, 2018 at 5:32 PM Alex L <<a href="mailto:arphaman@gmail.com">arphaman@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">The revert commit is r337782.</div><div class="gmail_extra"><br><div class="gmail_quote">On 23 July 2018 at 17:32, Alex L <span dir="ltr"><<a href="mailto:arphaman@gmail.com" target="_blank">arphaman@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi,<div><br></div><div>I had to revert your commit as it caused a number of failures in our public and internal CI.</div><div>When building compiler-rt on Darwin (stage1), after this commit the build failed to build X-ray and libfuzzer because the libc++ headers were no longer found. The compiler-rt libraries were built using freshly built stage1, so it makes sense why this happened (clang expected to find the libc++ headers in ../include, but they got moved to ../projects/libcxx/include).</div><div>Here are a couple of examples of the failures that we've observed:</div><div><br></div><div><a href="http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA/47583/console" target="_blank">http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA/47583/console</a><br></div><div><div>/Users/buildslave/jenkins/workspace/clang-stage1-configure-RA/llvm/projects/compiler-rt/lib/xray/xray_utils.h:18:10: fatal error: 'cstddef' file not found</div><div>#include <cstddef></div><div> ^~~~~~~~~</div><div>1 error generated.</div></div><div><br></div><div><a href="http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-expensive/12202/consoleFull" target="_blank">http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-expensive/12202/consoleFull</a><br></div><div><div>/Users/buildslave/jenkins/workspace/clang-stage1-cmake-RA-expensive/llvm/projects/compiler-rt/lib/fuzzer/FuzzerDefs.h:15:10: fatal error: 'cassert' file not found</div><div>#include <cassert></div><div> ^~~~~~~~~</div><div>1 error generated.</div></div><div><br></div><div>Let me know if you need help looking at or testing out a potential fix for Darwin.</div><div>Thanks,</div><div>Alex</div><div><br></div></div><div class="m_1324253676558670362HOEnZb"><div class="m_1324253676558670362h5"><div class="gmail_extra"><br><div class="gmail_quote">On 23 July 2018 at 11:58, Heejin Ahn via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: aheejin<br>
Date: Mon Jul 23 11:58:12 2018<br>
New Revision: 337727<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=337727&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=337727&view=rev</a><br>
Log:<br>
[CMake] Fix the setting of LIBCXX_HEADER_DIR<br>
<br>
Reviewers: phosek<br>
<br>
Subscribers: mgorny, christof, ldionne, cfe-commits<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D49629" rel="noreferrer" target="_blank">https://reviews.llvm.org/D49629</a><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=337727&r1=337726&r2=337727&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=337727&r1=337726&r2=337727&view=diff</a><br>
==============================================================================<br>
--- libcxx/trunk/CMakeLists.txt (original)<br>
+++ libcxx/trunk/CMakeLists.txt Mon Jul 23 11:58:12 2018<br>
@@ -378,7 +378,7 @@ endif ()<br>
set(LIBCXX_COMPILER ${CMAKE_CXX_COMPILER})<br>
set(LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})<br>
set(LIBCXX_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})<br>
-set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR})<br>
+set(LIBCXX_HEADER_DIR ${LIBCXX_BINARY_DIR})<br>
set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")<br>
<br>
string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>
</blockquote></div>