From 9770d348910b15b74bdcb3a1fbd6f68a5185aa50 Mon Sep 17 00:00:00 2001 From: Jose M Monsalve Diaz Date: Fri, 30 Jul 2021 11:26:26 -0500 Subject: [PATCH] [OpenMP] Fixing llvm-omp-device-info compilation with runtimes When using `-DLLVM_ENABLED_RUNTIMES` instead of `-DLLVM_ENABLED_PROJECTS` the `llvm-omp-device-info` tool is not compiled or installed. In general, no llvm tool would be build on runtimes, because the -DLLVM_BUILD_TOOLS flag is removed by the way runtimes compilation calls cmake again. This patch is simple. Just forward the value of this flag to the runtime cmake command. I'm also removing an unnecessary comment in the compilation of the tool Differential Revision: https://reviews.llvm.org/D107177 (cherry picked from commit 5424ceeda0534ab382e2a6cb192099f76ee8b12c) --- runtimes/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index 6ae087ef62d..2786aa45e06 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -232,6 +232,7 @@ function(runtime_default_target) -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_TRIPLE} -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default} + -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS} -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON