Skip to content

Commit d4ebfa8

Browse files
committed
fix icu data building
1 parent eea21ea commit d4ebfa8

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
git apply --reject --whitespace=fix ../patches/rename_output.patch
4040
git apply --reject --whitespace=fix ../patches/version_suffix.patch
4141
git apply --reject --whitespace=fix ../patches/build_vs_2022.patch
42+
git apply --reject --whitespace=fix ../patches/fix_icu_embedding.patch
4243
4344
- name: Build project
4445
if: runner.os != 'Windows'

patches/fix_icu_embedding.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git forkSrcPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp forkDstPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp
2+
index 741a8a5228ca6808ea486e765e8165e229cc73fb..f5c621ab151850ad5010df3ebb42f425ec0068c2 100644
3+
--- forkSrcPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp
4+
+++ forkDstPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp
5+
@@ -847,7 +847,7 @@ getArchitecture(uint16_t *pCPU, uint16_t *pBits, UBool *pIsBigEndian, const char
6+
# if defined(_M_IX86)
7+
*pCPU = IMAGE_FILE_MACHINE_I386;
8+
# else
9+
- *pCPU = IMAGE_FILE_MACHINE_UNKNOWN;
10+
+ *pCPU = IMAGE_FILE_MACHINE_AMD64;
11+
# endif
12+
# if defined(_M_IA64) || defined(_M_AMD64) || defined (_M_ARM64)
13+
*pBits = 64; // Doesn't seem to be used for anything interesting though?

0 commit comments

Comments
 (0)