Re: [libcxx] r337727 - [CMake] Fix the setting of LIBCXX_HEADER_DIR

2018-07-23 Thread Heejin Ahn via cfe-commits
Sorry, and thanks!

On Mon, Jul 23, 2018 at 5:32 PM Alex L  wrote:

> The revert commit is r337782.
>
> On 23 July 2018 at 17:32, Alex L  wrote:
>
>> Hi,
>>
>> I had to revert your commit as it caused a number of failures in our
>> public and internal CI.
>> 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).
>> Here are a couple of examples of the failures that we've observed:
>>
>> http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA/47583/console
>> /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
>> #include 
>>  ^
>> 1 error generated.
>>
>>
>> http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-expensive/12202/consoleFull
>> /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
>> #include 
>>  ^
>> 1 error generated.
>>
>> Let me know if you need help looking at or testing out a potential fix
>> for Darwin.
>> Thanks,
>> Alex
>>
>>
>> On 23 July 2018 at 11:58, Heejin Ahn via cfe-commits <
>> cfe-commits@lists.llvm.org> wrote:
>>
>>> Author: aheejin
>>> Date: Mon Jul 23 11:58:12 2018
>>> New Revision: 337727
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=337727&view=rev
>>> Log:
>>> [CMake] Fix the setting of LIBCXX_HEADER_DIR
>>>
>>> Reviewers: phosek
>>>
>>> Subscribers: mgorny, christof, ldionne, cfe-commits
>>>
>>> Differential Revision: https://reviews.llvm.org/D49629
>>>
>>> Modified:
>>> libcxx/trunk/CMakeLists.txt
>>>
>>> Modified: libcxx/trunk/CMakeLists.txt
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=337727&r1=337726&r2=337727&view=diff
>>>
>>> ==
>>> --- libcxx/trunk/CMakeLists.txt (original)
>>> +++ libcxx/trunk/CMakeLists.txt Mon Jul 23 11:58:12 2018
>>> @@ -378,7 +378,7 @@ endif ()
>>>  set(LIBCXX_COMPILER${CMAKE_CXX_COMPILER})
>>>  set(LIBCXX_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
>>>  set(LIBCXX_BINARY_DIR  ${CMAKE_CURRENT_BINARY_DIR})
>>> -set(LIBCXX_HEADER_DIR  ${LLVM_BINARY_DIR})
>>> +set(LIBCXX_HEADER_DIR  ${LIBCXX_BINARY_DIR})
>>>  set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")
>>>
>>>  string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION
>>>
>>>
>>> ___
>>> cfe-commits mailing list
>>> cfe-commits@lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>>>
>>
>>
>
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


Re: [libcxx] r337727 - [CMake] Fix the setting of LIBCXX_HEADER_DIR

2018-07-23 Thread Alex L via cfe-commits
Hi,

I had to revert your commit as it caused a number of failures in our public
and internal CI.
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).
Here are a couple of examples of the failures that we've observed:

http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA/47583/console
/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
#include 
 ^
1 error generated.

http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-expensive/12202/consoleFull
/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
#include 
 ^
1 error generated.

Let me know if you need help looking at or testing out a potential fix for
Darwin.
Thanks,
Alex


On 23 July 2018 at 11:58, Heejin Ahn via cfe-commits <
cfe-commits@lists.llvm.org> wrote:

> Author: aheejin
> Date: Mon Jul 23 11:58:12 2018
> New Revision: 337727
>
> URL: http://llvm.org/viewvc/llvm-project?rev=337727&view=rev
> Log:
> [CMake] Fix the setting of LIBCXX_HEADER_DIR
>
> Reviewers: phosek
>
> Subscribers: mgorny, christof, ldionne, cfe-commits
>
> Differential Revision: https://reviews.llvm.org/D49629
>
> Modified:
> libcxx/trunk/CMakeLists.txt
>
> Modified: libcxx/trunk/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/
> CMakeLists.txt?rev=337727&r1=337726&r2=337727&view=diff
> 
> ==
> --- libcxx/trunk/CMakeLists.txt (original)
> +++ libcxx/trunk/CMakeLists.txt Mon Jul 23 11:58:12 2018
> @@ -378,7 +378,7 @@ endif ()
>  set(LIBCXX_COMPILER${CMAKE_CXX_COMPILER})
>  set(LIBCXX_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
>  set(LIBCXX_BINARY_DIR  ${CMAKE_CURRENT_BINARY_DIR})
> -set(LIBCXX_HEADER_DIR  ${LLVM_BINARY_DIR})
> +set(LIBCXX_HEADER_DIR  ${LIBCXX_BINARY_DIR})
>  set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")
>
>  string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION
>
>
> ___
> cfe-commits mailing list
> cfe-commits@lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


Re: [libcxx] r337727 - [CMake] Fix the setting of LIBCXX_HEADER_DIR

2018-07-23 Thread Alex L via cfe-commits
The revert commit is r337782.

On 23 July 2018 at 17:32, Alex L  wrote:

> Hi,
>
> I had to revert your commit as it caused a number of failures in our
> public and internal CI.
> 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).
> Here are a couple of examples of the failures that we've observed:
>
> http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA/47583/console
> /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
> #include 
>  ^
> 1 error generated.
>
> http://lab.llvm.org:8080/green/job/clang-stage1-cmake-
> RA-expensive/12202/consoleFull
> /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
> #include 
>  ^
> 1 error generated.
>
> Let me know if you need help looking at or testing out a potential fix for
> Darwin.
> Thanks,
> Alex
>
>
> On 23 July 2018 at 11:58, Heejin Ahn via cfe-commits <
> cfe-commits@lists.llvm.org> wrote:
>
>> Author: aheejin
>> Date: Mon Jul 23 11:58:12 2018
>> New Revision: 337727
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=337727&view=rev
>> Log:
>> [CMake] Fix the setting of LIBCXX_HEADER_DIR
>>
>> Reviewers: phosek
>>
>> Subscribers: mgorny, christof, ldionne, cfe-commits
>>
>> Differential Revision: https://reviews.llvm.org/D49629
>>
>> Modified:
>> libcxx/trunk/CMakeLists.txt
>>
>> Modified: libcxx/trunk/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.
>> txt?rev=337727&r1=337726&r2=337727&view=diff
>> 
>> ==
>> --- libcxx/trunk/CMakeLists.txt (original)
>> +++ libcxx/trunk/CMakeLists.txt Mon Jul 23 11:58:12 2018
>> @@ -378,7 +378,7 @@ endif ()
>>  set(LIBCXX_COMPILER${CMAKE_CXX_COMPILER})
>>  set(LIBCXX_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
>>  set(LIBCXX_BINARY_DIR  ${CMAKE_CURRENT_BINARY_DIR})
>> -set(LIBCXX_HEADER_DIR  ${LLVM_BINARY_DIR})
>> +set(LIBCXX_HEADER_DIR  ${LIBCXX_BINARY_DIR})
>>  set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")
>>
>>  string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION
>>
>>
>> ___
>> cfe-commits mailing list
>> cfe-commits@lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>>
>
>
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[libcxx] r337727 - [CMake] Fix the setting of LIBCXX_HEADER_DIR

2018-07-23 Thread Heejin Ahn via cfe-commits
Author: aheejin
Date: Mon Jul 23 11:58:12 2018
New Revision: 337727

URL: http://llvm.org/viewvc/llvm-project?rev=337727&view=rev
Log:
[CMake] Fix the setting of LIBCXX_HEADER_DIR

Reviewers: phosek

Subscribers: mgorny, christof, ldionne, cfe-commits

Differential Revision: https://reviews.llvm.org/D49629

Modified:
libcxx/trunk/CMakeLists.txt

Modified: libcxx/trunk/CMakeLists.txt
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=337727&r1=337726&r2=337727&view=diff
==
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Mon Jul 23 11:58:12 2018
@@ -378,7 +378,7 @@ endif ()
 set(LIBCXX_COMPILER${CMAKE_CXX_COMPILER})
 set(LIBCXX_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
 set(LIBCXX_BINARY_DIR  ${CMAKE_CURRENT_BINARY_DIR})
-set(LIBCXX_HEADER_DIR  ${LLVM_BINARY_DIR})
+set(LIBCXX_HEADER_DIR  ${LIBCXX_BINARY_DIR})
 set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")
 
 string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits