[compiler-rt] r313549 - [cmake] Make it possible to build and test profile without sanitizers

Vedant Kumar via llvm-commits llvm-commits at lists.llvm.org
Mon Sep 18 11:13:47 PDT 2017


Author: vedantk
Date: Mon Sep 18 11:13:47 2017
New Revision: 313549

URL: http://llvm.org/viewvc/llvm-project?rev=313549&view=rev
Log:
[cmake] Make it possible to build and test profile without sanitizers

This should fix an issue which arises when running check-compiler-rt on
the coverage bot:
http://green.lab.llvm.org/green/job/clang-stage2-coverage-R_build/1590/

The bot doesn't build the sanitizers, but the check-compiler-rt target
always expects the profile runtime to exist.

Modified:
    compiler-rt/trunk/lib/CMakeLists.txt
    compiler-rt/trunk/test/CMakeLists.txt

Modified: compiler-rt/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/CMakeLists.txt?rev=313549&r1=313548&r2=313549&view=diff
==============================================================================
--- compiler-rt/trunk/lib/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/CMakeLists.txt Mon Sep 18 11:13:47 2017
@@ -39,7 +39,9 @@ if(COMPILER_RT_BUILD_SANITIZERS)
   foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD})
     compiler_rt_build_runtime(${sanitizer})
   endforeach()
+endif()
 
+if (COMPILER_RT_HAS_PROFILE)
   compiler_rt_build_runtime(profile)
 endif()
 

Modified: compiler-rt/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/CMakeLists.txt?rev=313549&r1=313548&r2=313549&view=diff
==============================================================================
--- compiler-rt/trunk/test/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/CMakeLists.txt Mon Sep 18 11:13:47 2017
@@ -71,7 +71,8 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
         compiler_rt_test_runtime(${sanitizer})
       endif()
     endforeach()
-
+  endif()
+  if (COMPILER_RT_HAS_PROFILE)
     compiler_rt_test_runtime(profile)
   endif()
   if(COMPILER_RT_BUILD_XRAY)




More information about the llvm-commits mailing list