RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix missing build dependencies on omp_gen

Browse Source 
Differential Revision: https://reviews.llvm.org/D83003
This commit is contained in:
Jon Roelofs 2020-07-02 07:54:57 -06:00
parent 5b06ff50e1
commit 76a7da04bb
6 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1131,7 +1131,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
# Installing the headers needs to depend on generating any public # Installing the headers needs to depend on generating any public
# tablegen'd headers. # tablegen'd headers.
add_custom_target(llvm-headers DEPENDS intrinsics_gen) add_custom_target(llvm-headers DEPENDS intrinsics_gen omp_gen)
set_target_properties(llvm-headers PROPERTIES FOLDER "Misc") set_target_properties(llvm-headers PROPERTIES FOLDER "Misc")
if (NOT LLVM_ENABLE_IDE) if (NOT LLVM_ENABLE_IDE)

3
cmake/modules/AddLLVM.cmake
View File

@ -925,6 +925,9 @@ function(add_llvm_pass_plugin name)
if (TARGET intrinsics_gen) if (TARGET intrinsics_gen)
add_dependencies(obj.${name} intrinsics_gen) add_dependencies(obj.${name} intrinsics_gen)
endif() endif()
if (TARGET omp_gen)
add_dependencies(obj.${name} omp_gen)
endif()
set_property(GLOBAL APPEND PROPERTY LLVM_STATIC_EXTENSIONS ${name}) set_property(GLOBAL APPEND PROPERTY LLVM_STATIC_EXTENSIONS ${name})
elseif(NOT ARG_NO_MODULE) elseif(NOT ARG_NO_MODULE)
add_llvm_library(${name} MODULE ${ARG_UNPARSED_ARGUMENTS}) add_llvm_library(${name} MODULE ${ARG_UNPARSED_ARGUMENTS})

3
cmake/modules/CMakeLists.txt
View File

@ -28,6 +28,9 @@ endforeach(lib)
if(intrinsics_gen IN_LIST LLVM_COMMON_DEPENDS) if(intrinsics_gen IN_LIST LLVM_COMMON_DEPENDS)
list(REMOVE_ITEM LLVM_COMMON_DEPENDS intrinsics_gen) list(REMOVE_ITEM LLVM_COMMON_DEPENDS intrinsics_gen)
endif() endif()
if(omp_gen IN_LIST LLVM_COMMON_DEPENDS)
list(REMOVE_ITEM LLVM_COMMON_DEPENDS omp_gen)
endif()
# Generate LLVMConfig.cmake for the build tree. # Generate LLVMConfig.cmake for the build tree.
set(LLVM_CONFIG_CODE " set(LLVM_CONFIG_CODE "

5
cmake/modules/LLVMConfig.cmake.in
View File

@ -104,12 +104,15 @@ if(NOT TARGET LLVMSupport)
@llvm_config_include_buildtree_only_exports@ @llvm_config_include_buildtree_only_exports@
endif() endif()
# By creating intrinsics_gen here, subprojects that depend on LLVM's # By creating intrinsics_gen and omp_gen here, subprojects that depend on LLVM's
# tablegen-generated headers can always depend on this target whether building # tablegen-generated headers can always depend on this target whether building
# in-tree with LLVM or not. # in-tree with LLVM or not.
if(NOT TARGET intrinsics_gen) if(NOT TARGET intrinsics_gen)
add_custom_target(intrinsics_gen) add_custom_target(intrinsics_gen)
endif() endif()
if(NOT TARGET omp_gen)
add_custom_target(omp_gen)
endif()
set_property(GLOBAL PROPERTY LLVM_TARGETS_CONFIGURED On) set_property(GLOBAL PROPERTY LLVM_TARGETS_CONFIGURED On)
include(${LLVM_CMAKE_DIR}/LLVM-Config.cmake) include(${LLVM_CMAKE_DIR}/LLVM-Config.cmake)

1
lib/Transforms/IPO/CMakeLists.txt
View File

@ -45,4 +45,5 @@ add_llvm_component_library(LLVMipo
DEPENDS DEPENDS
intrinsics_gen intrinsics_gen
omp_gen
) )

3
unittests/Frontend/CMakeLists.txt
View File

@ -10,6 +10,9 @@ set(LLVM_LINK_COMPONENTS
add_llvm_unittest(LLVMFrontendTests add_llvm_unittest(LLVMFrontendTests
OpenMPContextTest.cpp OpenMPContextTest.cpp
OpenMPIRBuilderTest.cpp OpenMPIRBuilderTest.cpp
DEPENDS
omp_gen
) )
target_link_libraries(LLVMFrontendTests PRIVATE LLVMTestingSupport) target_link_libraries(LLVMFrontendTests PRIVATE LLVMTestingSupport)