Skip to content
This repository was archived by the owner on Mar 28, 2020. It is now read-only.

Commit 4f10103

Browse files
committed
[CMake][runtimes] Use target specific name for all runtimes targets
We need to use target specific name for all runtimes targets. Target specific name means the name of target in the LLVM build is different from the name in runtimes build (in LLVM build, it's suffixed by the target itself). Previously we have only used target specific names for check targets collected through SUB_CHECK_TARGETS, but that's not sufficient, we need to use target specific names for all targets we're exposing in LLVM build. Fixes PR34335. Differential Revision: https://reviews.llvm.org/D37245 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@312405 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 026a351 commit 4f10103

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

runtimes/CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -306,22 +306,24 @@ else() # if this is included from LLVM's CMake
306306

307307
foreach(runtime_name ${runtime_names})
308308
list(APPEND ${name}_extra_targets
309-
${runtime_name}-${name}
310-
install-${runtime_name}-${name})
309+
"${runtime_name}:${runtime_name}-${name}"
310+
"install-${runtime_name}:install-${runtime_name}-${name}")
311311
if(LLVM_INCLUDE_TESTS)
312-
list(APPEND ${name}_test_targets check-${runtime_name}-${name})
312+
list(APPEND ${name}_test_targets "check-${runtime_name}:check-${runtime_name}-${name}")
313313
endif()
314314
endforeach()
315315

316-
foreach(name IN LISTS SUB_COMPONENTS SUB_INSTALL_TARGETS)
317-
list(APPEND ${name}_extra_targets "${name}:${name}-${name}")
316+
foreach(target_name IN LISTS SUB_COMPONENTS SUB_INSTALL_TARGETS)
317+
list(APPEND ${name}_extra_targets "${target_name}:${target_name}-${name}")
318318
endforeach()
319319

320320
if(LLVM_INCLUDE_TESTS)
321-
list(APPEND ${name}_test_targets runtimes-test-depends-${name} check-runtimes-${name})
321+
list(APPEND ${name}_test_targets
322+
"runtimes-test-depends:runtimes-test-depends-${name}"
323+
"check-runtimes:check-runtimes-${name}")
322324
foreach(target_name IN LISTS SUB_CHECK_TARGETS)
323325
list(APPEND ${name}_test_targets "${target_name}:${target_name}-${name}")
324-
list(APPEND test_targets ${target_name}-${name})
326+
list(APPEND test_targets "${target_name}-${name}")
325327
endforeach()
326328
set(test_targets "${test_targets}" PARENT_SCOPE)
327329
endif()

0 commit comments

Comments
 (0)