Skip to content

Commit 6e0cf0e

Browse files
committed
Add --enable-rpath to ICU's build
Remove ICU_DATA flags
1 parent 86fec40 commit 6e0cf0e

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

stdlib/public/runtime/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,6 @@ foreach(sdk ${SWIFT_SDKS})
220220
${libpthread}
221221
${android_libraries}
222222
-lswiftCore
223-
${libicu_i18n_a}
224-
${libicu_uc_a}
225-
${libicu_data_a}
226223
-lstdc++
227224
-lm
228225
-Xlinker -export-dynamic

utils/build-script-impl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2596,7 +2596,7 @@ for host in "${ALL_HOSTS[@]}"; do
25962596
${libicu_enable_debug} \
25972597
--enable-renaming --with-library-suffix=swift \
25982598
--libdir=${ICU_TMPLIBDIR} \
2599-
--enable-shared --enable-static \
2599+
--enable-shared --enable-static --enable-rpath \
26002600
--enable-strict --disable-icuio \
26012601
--disable-plugins --disable-dyload --disable-extras \
26022602
--disable-samples --disable-layoutex --with-data-packaging=auto

0 commit comments

Comments
 (0)