@@ -75,6 +75,28 @@ set(swift_runtime_library_compile_flags ${swift_runtime_compile_flags})
7575list (APPEND swift_runtime_library_compile_flags -DswiftCore_EXPORTS)
7676list (APPEND swift_runtime_library_compile_flags -I${SWIFT_SOURCE_DIR} /stdlib/include /llvm/Support -I${SWIFT_SOURCE_DIR} /include )
7777
78+ if (SWIFT_${SWIFT_HOST_VARIANT_SDK} _${SWIFT_HOST_VARIANT_ARCH} _ICU_STATICLIB)
79+ set (libicu_i18n_a -licui18nswift)
80+ set (libicu_uc_a -licuucswift)
81+ set (libicu_data_a -licudataswift)
82+ else ()
83+ find_package (ICU REQUIRED COMPONENTS uc i18n)
84+ get_filename_component (ICU_UC_LIBDIR "${ICU_UC_LIBRARIES} " DIRECTORY )
85+ get_filename_component (ICU_I18N_LIBDIR "${ICU_I18N_LIBRARIES} " DIRECTORY )
86+
87+ set (libicu_i18n_a -licui18n)
88+ set (libicu_uc_a -licuuc)
89+ set (libicu_data_a)
90+ if (EXISTS ${ICU_I18N_LIBDIR} /libicui18n.a AND
91+ EXISTS ${ICU_UC_LIBDIR} /libicuuc.a AND
92+ EXISTS ${ICU_UC_LIBDIR} /libicudata.a)
93+ set (libicu_i18n_a ${ICU_I18N_LIBDIR} /libicui18n.a)
94+ set (libicu_uc_a ${ICU_UC_LIBDIR} /libicuuc.a)
95+ set (libicu_data_a ${ICU_UC_LIBDIR} /libicudata.a)
96+ endif ()
97+ endif ()
98+
99+
78100set (sdk "${SWIFT_HOST_VARIANT_SDK} " )
79101if (SWIFT_BUILD_STATIC_STDLIB AND "${sdk} " STREQUAL "LINUX" )
80102 list (REMOVE_ITEM swift_runtime_sources ImageInspectionELF.cpp)
@@ -254,27 +276,6 @@ foreach(sdk ${SWIFT_CONFIGURED_SDKS})
254276 # 'GenericUnix' (eg linux)
255277 if (${SWIFT_SDK_${sdk} _OBJECT_FORMAT} STREQUAL ELF)
256278 string (TOLOWER "${sdk} " lowercase_sdk)
257- if (SWIFT_${SWIFT_HOST_VARIANT_SDK} _${SWIFT_HOST_VARIANT_ARCH} _ICU_STATICLIB)
258- set (libicu_i18n_a -licui18nswift)
259- set (libicu_uc_a -licuucswift)
260- set (libicu_data_a -licudataswift)
261- else ()
262- find_package (ICU REQUIRED COMPONENTS uc i18n)
263- get_filename_component (ICU_UC_LIBDIR "${ICU_UC_LIBRARIES} " DIRECTORY )
264- get_filename_component (ICU_I18N_LIBDIR "${ICU_I18N_LIBRARIES} " DIRECTORY )
265-
266- set (libicu_i18n_a -licui18n)
267- set (libicu_uc_a -licuuc)
268- set (libicu_data_a)
269- if (EXISTS ${ICU_I18N_LIBDIR} /libicui18n.a AND
270- EXISTS ${ICU_UC_LIBDIR} /libicuuc.a AND
271- EXISTS ${ICU_UC_LIBDIR} /libicudata.a)
272- set (libicu_i18n_a ${ICU_I18N_LIBDIR} /libicui18n.a)
273- set (libicu_uc_a ${ICU_UC_LIBDIR} /libicuuc.a)
274- set (libicu_data_a ${ICU_UC_LIBDIR} /libicudata.a)
275- endif ()
276- endif ()
277-
278279 set (linkfile ${lowercase_sdk} /static -stdlib-args.lnk)
279280 file (WRITE "${SWIFTSTATICLIB_DIR} /${linkfile} " "
280281-ldl
0 commit comments