Skip to content

Commit 8e73658

Browse files
committed
build: remove ICU handling in the android host handling
The host tools do not use ICU, only the standard library does. Remove the special handling in the host tool path for ICU. This simplifies the flag computation and allows the ICU handling to be sunk entirely into the target specific paths.
1 parent 123c2b0 commit 8e73658

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -380,11 +380,6 @@ function(_add_host_variant_link_flags target)
380380
target_link_libraries(${target} PRIVATE
381381
${cxx_link_libraries})
382382

383-
# link against the ICU libraries
384-
target_link_libraries(${target} PRIVATE
385-
${SWIFT_ANDROID_${SWIFT_HOST_VARIANT_ARCH}_ICU_I18N}
386-
${SWIFT_ANDROID_${SWIFT_HOST_VARIANT_ARCH}_ICU_UC})
387-
388383
swift_android_lib_for_arch(${SWIFT_HOST_VARIANT_ARCH}
389384
${SWIFT_HOST_VARIANT_ARCH}_LIB)
390385
target_link_directories(${target} PRIVATE
@@ -402,19 +397,6 @@ function(_add_host_variant_link_flags target)
402397
endif()
403398
endif()
404399

405-
if(NOT "${SWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_SDK}_ICU_UC}" STREQUAL "")
406-
get_filename_component(SWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_ARCH}_ICU_UC_LIBDIR
407-
"${SWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_SDK}_ICU_UC}" DIRECTORY)
408-
target_link_directories(${target} PRIVATE
409-
"${SWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_ARCH}_ICU_UC_LIBDIR}")
410-
endif()
411-
if(NOT "${SWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_ARCH}_ICU_I18N}" STREQUAL "")
412-
get_filename_component(SWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_SDK}_ICU_I18N_LIBDIR
413-
"${SWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_ARCH}_ICU_I18N}" DIRECTORY)
414-
target_link_directories(${target} PRIVATE
415-
"${SWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_ARCH}_ICU_I18N_LIBDIR}")
416-
endif()
417-
418400
if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)
419401
# FIXME: On Apple platforms, find_program needs to look for "ld64.lld"
420402
find_program(LDLLD_PATH "ld.lld")

0 commit comments

Comments
 (0)