Skip to content

Commit 4f5feba

Browse files
authored
Merge pull request #23395 from drodriguez/fix-dry-run
[build-script] Respect dry-run when building/testing ICU
2 parents 384882d + bc786c9 commit 4f5feba

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

utils/build-script-impl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2796,16 +2796,16 @@ for host in "${ALL_HOSTS[@]}"; do
27962796
ICU_LIBDIR_STATIC="$(build_directory ${host} swift)/lib/swift_static/${SWIFT_HOST_VARIANT}"
27972797
ICU_LIBDIR_STATIC_ARCH="$(build_directory ${host} swift)/lib/swift_static/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}"
27982798
# Add in the ICU renaming config into uconfig.h
2799-
sed -e "/^#define __UCONFIG_H__/ r ${LIBICU_BUILD_DIR}/uconfig.h.prepend" -i ${ICU_TMPINSTALL}/include/unicode/uconfig.h
2799+
call sed -e "/^#define __UCONFIG_H__/ r ${LIBICU_BUILD_DIR}/uconfig.h.prepend" -i ${ICU_TMPINSTALL}/include/unicode/uconfig.h
28002800

28012801
if [ $(true_false "${BUILD_SWIFT_STATIC_STDLIB}") == "TRUE" ]; then
28022802
# Copy the static libs into the swift_static directory
2803-
mkdir -p "${ICU_LIBDIR_STATIC_ARCH}"
2803+
call mkdir -p "${ICU_LIBDIR_STATIC_ARCH}"
28042804
for l in uc i18n data
28052805
do
28062806
lib="${ICU_LIBDIR}/libicu${l}swift.a"
2807-
cp "${lib}" "${ICU_LIBDIR_STATIC}"
2808-
cp "${lib}" "${ICU_LIBDIR_STATIC_ARCH}"
2807+
call cp "${lib}" "${ICU_LIBDIR_STATIC}"
2808+
call cp "${lib}" "${ICU_LIBDIR_STATIC_ARCH}"
28092809
done
28102810
fi
28112811

@@ -3677,31 +3677,31 @@ for host in "${ALL_HOSTS[@]}"; do
36773677
ICU_INSTALL_DIR="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})"
36783678
ICU_LIBDIR="$(build_directory ${host} swift)/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}"
36793679
LIBICU_DEST_DIR="${ICU_INSTALL_DIR}lib/swift/${SWIFT_HOST_VARIANT}"
3680-
mkdir -p ${LIBICU_DEST_DIR}
3680+
call mkdir -p ${LIBICU_DEST_DIR}
36813681

36823682
for l in uc i18n data
36833683
do
36843684
lib=${ICU_LIBDIR}/libicu${l}swift
36853685
echo "${lib} => ${LIBICU_DEST_DIR}"
3686-
cp -d ${lib}.so ${lib}.so.* ${LIBICU_DEST_DIR}
3686+
call cp -d ${lib}.so ${lib}.so.* ${LIBICU_DEST_DIR}
36873687
done
36883688

36893689
if [ $(true_false "${BUILD_SWIFT_STATIC_STDLIB}") == "TRUE" ]; then
36903690
LIBICU_DEST_DIR_STATIC="${ICU_INSTALL_DIR}lib/swift_static/${SWIFT_HOST_VARIANT}"
3691-
mkdir -p ${LIBICU_DEST_DIR_STATIC}
3691+
call mkdir -p ${LIBICU_DEST_DIR_STATIC}
36923692
for l in uc i18n data
36933693
do
36943694
lib=${ICU_LIBDIR}/libicu${l}swift
36953695
echo "${lib} => ${LIBICU_DEST_DIR_STATIC}"
3696-
cp -d ${lib}.a ${LIBICU_DEST_DIR_STATIC}
3696+
call cp -d ${lib}.a ${LIBICU_DEST_DIR_STATIC}
36973697
done
36983698
fi
36993699

37003700
ICU_TMP_INSTALL_DIR="${ICU_BUILD_DIR}/tmp_install"
3701-
mkdir -p "${ICU_INSTALL_DIR}include"
3702-
cp -a "${ICU_TMP_INSTALL_DIR}/include/unicode" "${ICU_INSTALL_DIR}include"
3703-
mkdir -p "${ICU_INSTALL_DIR}share/icuswift"
3704-
cp -a "${ICU_TMP_INSTALL_DIR}/share/icuswift" "${ICU_INSTALL_DIR}share"
3701+
call mkdir -p "${ICU_INSTALL_DIR}include"
3702+
call cp -a "${ICU_TMP_INSTALL_DIR}/include/unicode" "${ICU_INSTALL_DIR}include"
3703+
call mkdir -p "${ICU_INSTALL_DIR}share/icuswift"
3704+
call cp -a "${ICU_TMP_INSTALL_DIR}/share/icuswift" "${ICU_INSTALL_DIR}share"
37053705
continue
37063706
;;
37073707
playgroundsupport)

0 commit comments

Comments
 (0)