blob: 68d8ebc9f8a14485ce792254286669da81f11248 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
Backported from https://reviews.llvm.org/D108404
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -350,15 +350,19 @@
# Create a runtimes target that uses this file as its top-level CMake file.
# The runtimes target is a configuration of all the runtime libraries
# together in a single CMake invocaiton.
+ if("openmp" IN_LIST LLVM_ENABLE_RUNTIMES)
+ message(STATUS "Adding dependencies opt llvm-link")
+ set(extra_deps opt llvm-link)
+ endif()
if(NOT LLVM_RUNTIME_TARGETS)
runtime_default_target(
- DEPENDS ${deps}
+ DEPENDS ${deps} ${extra_deps}
PREFIXES ${prefixes})
set(test_targets check-runtimes)
else()
if("default" IN_LIST LLVM_RUNTIME_TARGETS)
runtime_default_target(
- DEPENDS ${deps}
+ DEPENDS ${deps} ${extra_deps}
PREFIXES ${prefixes})
list(REMOVE_ITEM LLVM_RUNTIME_TARGETS "default")
else()
diff --git a/openmp/libomptarget/DeviceRTL/CMakeLists.txt b/openmp/libomptarget/DeviceRTL/CMakeLists.txt
--- a/openmp/libomptarget/DeviceRTL/CMakeLists.txt
+++ b/openmp/libomptarget/DeviceRTL/CMakeLists.txt
@@ -151,6 +151,7 @@
# Create target to build all Bitcode libraries.
add_custom_target(omptarget-new-nvptx-bc)
+add_dependencies(omptarget-new-nvptx-bc opt llvm-link)
# Generate a Bitcode library for all the compute capabilities the user requested
foreach(sm ${nvptx_sm_list})
@@ -197,6 +198,7 @@
add_custom_target(${bclib_target_name} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${bclib_name}_opt)
add_dependencies(omptarget-new-nvptx-bc ${bclib_target_name})
+ add_dependencies(${bclib_target_name} opt llvm-link)
# Copy library to destination.
add_custom_command(TARGET ${bclib_target_name} POST_BUILD
diff --git a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
--- a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
+++ b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
@@ -157,7 +157,7 @@
add_custom_command(
OUTPUT ${bc_libname}
COMMAND ${LINK_TOOL} ${bc_files} | ${OPT_TOOL} --always-inline -o ${OUTPUTDIR}/${bc_libname}
- DEPENDS ${bc_files} opt)
+ DEPENDS ${bc_files} llvm-link opt)
add_custom_target(lib${libname}-${mcpu} ALL DEPENDS ${bc_libname})
|
