diff options
Diffstat (limited to 'external/icu/UnpackedTarball_icu.mk')
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 002b7d28cab5..435382fa7988 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -28,20 +28,19 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-macosx.patch.1 \ external/icu/icu4c-solarisgcc.patch.1 \ external/icu/icu4c-mkdir.patch.1 \ - external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \ external/icu/icu4c-ubsan.patch.1 \ external/icu/icu4c-scriptrun.patch.1 \ external/icu/icu4c-rtti.patch.1 \ external/icu/icu4c-clang-cl.patch.1 \ - $(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \ external/icu/gcc9.patch \ external/icu/c++20-comparison.patch \ - external/icu/ubsan.patch \ + external/icu/ubsan.patch.1 \ external/icu/Wdeprecated-copy-dtor.patch \ external/icu/icu4c-khmerbreakengine.patch.1 \ external/icu/strict_ansi.patch \ - external/icu/icu4c-link-scrptrun.patch.2 \ external/icu/icu4c-windows-cygwin-cross.patch.1 \ + external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \ + $(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \ )) $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict)) |