summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2019-11-03 21:52:38 (GMT)
committerMark Brand <mabrand@mabrand.nl>2019-11-03 21:52:38 (GMT)
commit3f0668d21d2d0204d8cb7d29374ca659241b73cf (patch)
treed6b30407453caee681e6b4d3e787a280b45122a7 /src
parent3c46541e4969262f04deaf97d0e459bbcd040018 (diff)
downloadmxe-3f0668d21d2d0204d8cb7d29374ca659241b73cf.zip
mxe-3f0668d21d2d0204d8cb7d29374ca659241b73cf.tar.gz
mxe-3f0668d21d2d0204d8cb7d29374ca659241b73cf.tar.bz2
Revert "icu4c: fix shared build by removing obsolete hack"
The patch seems to have been a misguided response to a interference from a previous build. This reverts commit 82ef2bc32c0e07c1e4c0afaade2bdefea3483c94.
Diffstat (limited to 'src')
-rw-r--r--src/icu4c.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/icu4c.mk b/src/icu4c.mk
index ef4c8bf..b16a6e8 100644
--- a/src/icu4c.mk
+++ b/src/icu4c.mk
@@ -54,6 +54,9 @@ define $(PKG)_BUILD_SHARED
# icu4c installs its DLLs to lib/. Move them to bin/.
mv -fv $(PREFIX)/$(TARGET)/lib/icu*.dll '$(PREFIX)/$(TARGET)/bin/'
+ # stub data is icudt.dll, actual data is libicudt.dll - prefer actual
+ mv -fv '$(PREFIX)/$(TARGET)/lib/libicudt$($(PKG)_MAJOR).dll' '$(PREFIX)/$(TARGET)/bin/icudt$($(PKG)_MAJOR).dll'
+
$($(PKG)_BUILD_TEST)
# bundle test to verify deployment