@@ -2550,6 +2550,20 @@ for host in "${ALL_HOSTS[@]}"; do
2550
2550
continue
2551
2551
fi
2552
2552
2553
+ if [[ ! " ${SKIP_BUILD_LIBICU} " ]] ; then
2554
+ ICU_ROOT=$( build_directory ${host} libicu) /tmp_install
2555
+ LIBICU_BUILD_ARGS=(
2556
+ -DICU_ROOT:PATH=${ICU_ROOT}
2557
+ -DICU_INCLUDE_DIR:PATH=${ICU_ROOT} /include
2558
+ -DICU_UC_LIBRARIES:FILEPATH=${ICU_LIBDIR} /libicuucswift.so
2559
+ -DICU_UC_LIBRARY:FILEPATH=${ICU_LIBDIR} /libicuucswift.so
2560
+ -DICU_I18N_LIBRARIES:FILEPATH=${ICU_LIBDIR} /libicui18nswift.so
2561
+ -DICU_I18N_LIBRARY:FILEPATH=${ICU_LIBDIR} /libicui18nswift.so
2562
+ )
2563
+ else
2564
+ LIBICU_BUILD_ARGS=()
2565
+ fi
2566
+
2553
2567
# Staging: require opt-in for building with dispatch
2554
2568
if [[ ! " ${SKIP_BUILD_LIBDISPATCH} " ]] ; then
2555
2569
LIBDISPATCH_BUILD_DIR=" $( build_directory ${host} libdispatch) "
@@ -2574,6 +2588,7 @@ for host in "${ALL_HOSTS[@]}"; do
2574
2588
-DCMAKE_SWIFT_COMPILER:PATH=${SWIFTC_BIN}
2575
2589
-DCMAKE_INSTALL_PREFIX:PATH=$( get_host_install_prefix ${host} )
2576
2590
2591
+ ${LIBICU_BUILD_ARGS[@]}
2577
2592
${LIBDISPATCH_BUILD_ARGS[@]}
2578
2593
2579
2594
# NOTE(compnerd) we disable tests because XCTest is not ready
@@ -3125,6 +3140,20 @@ for host in "${ALL_HOSTS[@]}"; do
3125
3140
continue
3126
3141
fi
3127
3142
3143
+ if [[ ! " ${SKIP_BUILD_LIBICU} " ]] ; then
3144
+ ICU_ROOT=$( build_directory ${host} libicu) /tmp_install
3145
+ LIBICU_BUILD_ARGS=(
3146
+ -DICU_ROOT:PATH=${ICU_ROOT}
3147
+ -DICU_INCLUDE_DIR:PATH=${ICU_ROOT} /include
3148
+ -DICU_UC_LIBRARIES:FILEPATH=${ICU_LIBDIR} /libicuucswift.so
3149
+ -DICU_UC_LIBRARY:FILEPATH=${ICU_LIBDIR} /libicuucswift.so
3150
+ -DICU_I18N_LIBRARIES:FILEPATH=${ICU_LIBDIR} /libicui18nswift.so
3151
+ -DICU_I18N_LIBRARY:FILEPATH=${ICU_LIBDIR} /libicui18nswift.so
3152
+ )
3153
+ else
3154
+ LIBICU_BUILD_ARGS=()
3155
+ fi
3156
+
3128
3157
if [[ ! " ${SKIP_BUILD_LIBDISPATCH} " ]] ; then
3129
3158
LIBDISPATCH_BUILD_DIR=" $( build_directory ${host} libdispatch) "
3130
3159
LIBDISPATCH_BUILD_ARGS=(
@@ -3143,6 +3172,7 @@ for host in "${ALL_HOSTS[@]}"; do
3143
3172
-DCMAKE_SWIFT_COMPILER:PATH=${SWIFTC_BIN}
3144
3173
-DCMAKE_INSTALL_PREFIX:PATH=$( get_host_install_prefix ${host} )
3145
3174
3175
+ ${LIBICU_BUILD_ARGS[@]}
3146
3176
${LIBDISPATCH_BUILD_ARGS[@]}
3147
3177
3148
3178
# NOTE(compnerd) the time has come to enable tests now
@@ -3453,7 +3483,8 @@ for host in "${ALL_HOSTS[@]}"; do
3453
3483
ICU_TMP_INSTALL_DIR=" ${ICU_BUILD_DIR} /tmp_install"
3454
3484
mkdir -p " ${ICU_INSTALL_DIR} include"
3455
3485
cp -a " ${ICU_TMP_INSTALL_DIR} /include/unicode" " ${ICU_INSTALL_DIR} include"
3456
-
3486
+ mkdir -p " ${ICU_INSTALL_DIR} share/icuswift"
3487
+ cp -a " ${ICU_TMP_INSTALL_DIR} /share/icuswift" " ${ICU_INSTALL_DIR} share"
3457
3488
continue
3458
3489
;;
3459
3490
playgroundsupport)
0 commit comments