[runtimes] Name stripped install targets consistently
We were previously naming sub-component stripped install targets as `install-${component}-stripped-${triple}`, whereas everywhere else names them `install-${component}-${triple}-stripped`. This inconsistency would cause issues when LLVM_RUNTIME_DISTRIBUTION_COMPONENTS contained a sub-component (which I'm addding support for next). Reviewed By: phosek, #libc, #libc_abi, ldionne Differential Revision: https://reviews.llvm.org/D138965
This commit is contained in:
parent
5eacdcff06
commit
6de939dbe7
|
@ -275,11 +275,17 @@ function(runtime_register_target name target)
|
|||
endif()
|
||||
endforeach()
|
||||
|
||||
foreach(target_name IN LISTS SUB_COMPONENTS SUB_INSTALL_TARGETS)
|
||||
foreach(target_name IN LISTS SUB_COMPONENTS)
|
||||
set(${target_name}-${name} ${target_name})
|
||||
list(APPEND ${name}_extra_targets ${target_name}-${name})
|
||||
endforeach()
|
||||
|
||||
foreach(target_name IN LISTS SUB_INSTALL_TARGETS)
|
||||
set(${target_name}-${name} ${target_name})
|
||||
set(${target_name}-${name}-stripped ${target_name}-stripped)
|
||||
list(APPEND ${name}_extra_targets ${target_name}-${name} ${target_name}-${name}-stripped)
|
||||
endforeach()
|
||||
|
||||
foreach(component ${LLVM_RUNTIME_DISTRIBUTION_COMPONENTS})
|
||||
set(${component}-${name} ${component})
|
||||
set(install-${component}-${name} install-${component})
|
||||
|
|
|
@ -269,9 +269,6 @@ if(SUB_COMPONENTS)
|
|||
if(TARGET install-${component})
|
||||
list(APPEND SUB_INSTALL_TARGETS install-${component})
|
||||
endif()
|
||||
if(TARGET install-${component}-stripped)
|
||||
list(APPEND SUB_INSTALL_TARGETS install-${component}-stripped)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
if(LLVM_RUNTIMES_TARGET)
|
||||
|
|
Loading…
Reference in New Issue