diff options
Diffstat (limited to 'Build/source/libs')
| -rw-r--r-- | Build/source/libs/icu/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/libs/icu/Makefile.am | 4 | ||||
| -rw-r--r-- | Build/source/libs/icu/Makefile.in | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog index e98833ceb29..f203f18727b 100644 --- a/Build/source/libs/icu/ChangeLog +++ b/Build/source/libs/icu/ChangeLog @@ -1,3 +1,8 @@ +2019-02-14 Karl Berry <karl@tug.org> + + * Makefile.am (icubuild): cp icudt.a to icudata.a + and libicuin.a libicui18n.a, for mingw cross compile, per Luigi. + 2019-02-10 Karl Berry <karl@tug.org> * Makefile.am (LDADD) [cross]: icu-native/lib/icudt.a per Luigi. diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am index 63e061523f4..93f880cafed 100644 --- a/Build/source/libs/icu/Makefile.am +++ b/Build/source/libs/icu/Makefile.am @@ -57,6 +57,10 @@ if cross cd icu-native && $(MAKE) $(AM_MAKEFLAGS) all endif cross cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all +# these two cp commands are a kludge for mingw cross compilation. + cd icu-build/lib && (test ! -r icudt.a || cp icudt.a libicudata.a) + cd icu-build/lib && (test ! -r libicuin.a || cp libicuin.a libicui18n.a) +# cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all check-makeflags: diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in index 7570b3a6ede..ed8b05ea17e 100644 --- a/Build/source/libs/icu/Makefile.in +++ b/Build/source/libs/icu/Makefile.in @@ -1333,6 +1333,10 @@ icu-native/Makefile: icubuild: icu-build/Makefile check-makeflags @cross_TRUE@ cd icu-native && $(MAKE) $(AM_MAKEFLAGS) all cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all +# these two cp commands are a kludge for mingw cross compilation. + cd icu-build/lib && (test ! -r icudt.a || cp icudt.a libicudata.a) + cd icu-build/lib && (test ! -r libicuin.a || cp libicuin.a libicui18n.a) +# cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all check-makeflags: |