diff options
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-android.patch | 2 | ||||
| -rw-r--r-- | icu/makefile.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch index 1eb910a7daac..ad513a2afdf4 100644 --- a/icu/icu4c-android.patch +++ b/icu/icu4c-android.patch @@ -34,7 +34,7 @@ # wchar_t can be used CHECK_UTF16_STRING_RESULT="available" ;; -+*-*-*-androideabi*) ++*-*-*-androideabi|mips-unknown-linux-android) + # no UTF-16 strings thanks, I think, this is to avoid the -std=c++0x which causes trouble with uint64_t + CHECK_UTF16_STRING_RESULT="nope" + ;; diff --git a/icu/makefile.mk b/icu/makefile.mk index a6da650912ba..e7fa92587651 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -153,7 +153,7 @@ BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-bu .IF "$(OS)"=="ANDROID" LIBRARY_SUFFIX= --with-library-suffix=lo -icu_LDFLAGS+=-lgnustl_shared +icu_LDFLAGS+=-lgnustl_shared -lm .ENDIF CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ |