[compiler-rt] r271327 - [CMake] Update to requiring CMake 3.4.3

Xinliang David Li via llvm-commits llvm-commits at lists.llvm.org
Thu Jun 2 13:15:08 PDT 2016


The following patch fixes the problem. With this patch, ninja check-profile
reports success with 129 passes.

Can you check if it is the right fix?

David


Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt      (revision 271566)
+++ CMakeLists.txt      (working copy)
@@ -16,6 +16,7 @@ else()
 endif()

 cmake_minimum_required(VERSION 3.4.3)
+cmake_policy(SET CMP0056 OLD)

 # FIXME: It may be removed when we use 2.8.12.
 if(CMAKE_VERSION VERSION_LESS 2.8.12)







On Thu, Jun 2, 2016 at 12:00 PM, Xinliang David Li <xinliangli at gmail.com>
wrote:

> Chris, this change seems to have broken compiler_rt testing's coverage.
> WIth this change, PROFILE_SUPPORTED_ARCH is no longer properly defined. On
> X86_64, it is defined to be X86_64 while before this change, it was set to
> X86_64, i386 and i686. The errors I got:
>
> cannot open  ... ../lib/clang/3.9.0/lib/linux/libclang_rt.profile-i386.a:
> No such file or directory
>
>
> sanitizer testing seems to be affected too -- no failures, but the number
> of tests is reduced.
>
> Can you take a look?
>
> David
>
>
> On Tue, May 31, 2016 at 1:21 PM, Chris Bieneman via llvm-commits <
> llvm-commits at lists.llvm.org> wrote:
>
>> Author: cbieneman
>> Date: Tue May 31 15:21:42 2016
>> New Revision: 271327
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=271327&view=rev
>> Log:
>> [CMake] Update to requiring CMake 3.4.3
>>
>> Summary:
>> This is as per the discussions on developer lists:
>>
>> http://lists.llvm.org/pipermail/llvm-dev/2016-April/098780.html
>> http://lists.llvm.org/pipermail/llvm-dev/2016-May/100058.html
>>
>> Subscribers: llvm-commits
>>
>> Differential Revision: http://reviews.llvm.org/D20824
>>
>> Modified:
>>     compiler-rt/trunk/CMakeLists.txt
>>     compiler-rt/trunk/lib/builtins/CMakeLists.txt
>>
>> Modified: compiler-rt/trunk/CMakeLists.txt
>> URL:
>> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=271327&r1=271326&r2=271327&view=diff
>>
>> ==============================================================================
>> --- compiler-rt/trunk/CMakeLists.txt (original)
>> +++ compiler-rt/trunk/CMakeLists.txt Tue May 31 15:21:42 2016
>> @@ -15,16 +15,7 @@ else()
>>    set(COMPILER_RT_STANDALONE_BUILD FALSE)
>>  endif()
>>
>> -# The CompilerRT build system requires CMake version 2.8.8 or higher in
>> order
>> -# to use its support for building convenience "libraries" as a
>> collection of
>> -# .o files. This is particularly useful in producing larger, more complex
>> -# runtime libraries.
>> -if (NOT MSVC)
>> -  cmake_minimum_required(VERSION 2.8.8)
>> -else()
>> -  # Version 2.8.12.1 is required to build with Visual Studio 2013.
>> -  cmake_minimum_required(VERSION 2.8.12.1)
>> -endif()
>> +cmake_minimum_required(VERSION 3.4.3)
>>
>>  # FIXME: It may be removed when we use 2.8.12.
>>  if(CMAKE_VERSION VERSION_LESS 2.8.12)
>>
>> Modified: compiler-rt/trunk/lib/builtins/CMakeLists.txt
>> URL:
>> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/CMakeLists.txt?rev=271327&r1=271326&r2=271327&view=diff
>>
>> ==============================================================================
>> --- compiler-rt/trunk/lib/builtins/CMakeLists.txt (original)
>> +++ compiler-rt/trunk/lib/builtins/CMakeLists.txt Tue May 31 15:21:42 2016
>> @@ -3,7 +3,7 @@
>>  # architecture-specific code in various subdirectories.
>>
>>  if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
>> -  cmake_minimum_required(VERSION 2.8.12.1)
>> +  cmake_minimum_required(VERSION 3.4.3)
>>
>>    project(CompilerRTBuiltins C ASM)
>>    set(COMPILER_RT_STANDALONE_BUILD TRUE)
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160602/05ed1754/attachment.html>


More information about the llvm-commits mailing list