Skip to content

Commit 736b747

Browse files
authored
Merge pull request #41252 from Azoy/fix-linux-icu-static-56
[5.6] [build] Explicitly pass ICU_DATA_LIBRARY when building foundation
2 parents a43b04f + 483eb92 commit 736b747

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

utils/build-script-impl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2454,6 +2454,10 @@ for host in "${ALL_HOSTS[@]}"; do
24542454
LIBICU_BUILD_ARGS=(
24552455
-DICU_ROOT:PATH=${ICU_ROOT}
24562456
-DICU_INCLUDE_DIR:PATH=${ICU_ROOT}/include
2457+
-DICU_DATA_LIBRARIES:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
2458+
-DICU_DATA_LIBRARY:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
2459+
-DICU_DATA_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
2460+
-DICU_DATA_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
24572461
-DICU_UC_LIBRARIES:FILEPATH=${ICU_LIBDIR}/libicuucswift.so
24582462
-DICU_UC_LIBRARY:FILEPATH=${ICU_LIBDIR}/libicuucswift.so
24592463
-DICU_UC_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR}/libicuucswift.so
@@ -2924,6 +2928,10 @@ for host in "${ALL_HOSTS[@]}"; do
29242928
LIBICU_BUILD_ARGS=(
29252929
-DICU_ROOT:PATH=${ICU_ROOT}
29262930
-DICU_INCLUDE_DIR:PATH=${ICU_ROOT}/include
2931+
-DICU_DATA_LIBRARIES:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
2932+
-DICU_DATA_LIBRARY:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
2933+
-DICU_DATA_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
2934+
-DICU_DATA_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
29272935
-DICU_UC_LIBRARIES:FILEPATH=${ICU_LIBDIR}/libicuucswift.so
29282936
-DICU_UC_LIBRARY:FILEPATH=${ICU_LIBDIR}/libicuucswift.so
29292937
-DICU_UC_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR}/libicuucswift.so

0 commit comments

Comments
 (0)