maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[NFC][libomptarget] Fixed -DLLVM_ENABLE_RUNTIMES="openmp" build. 

Differential Revision: https://reviews.llvm.org/D104535
This commit is contained in:
Vyacheslav Zakharin 2021-06-18 07:17:23 -07:00
parent 9777f3fd06
commit c5b7c7c8f7
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake
View File

@ -33,9 +33,16 @@ if (OPENMP_STANDALONE_BUILD)
list(APPEND CMAKE_MODULE_PATH ${LLVM_CMAKE_DIR})
include(AddLLVM)
else()
# Note that OPENMP_STANDALONE_BUILD is FALSE, when
# openmp is built with -DLLVM_ENABLE_RUNTIMES="openmp" vs
# -DLLVM_ENABLE_PROJECTS="openmp", but openmp build
# is actually done as a standalone project build with many
# LLVM CMake variables propagated to it.
list(APPEND LIBOMPTARGET_LLVM_INCLUDE_DIRS
${LLVM_MAIN_INCLUDE_DIR} ${LLVM_BINARY_DIR}/include
)
message(STATUS
"Using LLVM include directories: ${LIBOMPTARGET_LLVM_INCLUDE_DIRS}")
endif()
################################################################################

1
openmp/libomptarget/plugins/common/elf_common/CMakeLists.txt
View File

@ -15,6 +15,7 @@ add_library(elf_common OBJECT elf_common.cpp)
llvm_update_compile_flags(elf_common)
set(LINK_LLVM_LIBS LLVMBinaryFormat LLVMObject LLVMSupport)
target_link_libraries(elf_common INTERFACE ${LINK_LLVM_LIBS} ${LIBOMPTARGET_DEP_LIBELF_LIBRARIES})
include_directories(${LIBOMPTARGET_LLVM_INCLUDE_DIRS})
add_dependencies(elf_common ${LINK_LLVM_LIBS})
# The code uses Debug.h, which requires threads support.