diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 21:25:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 11:42:58 +0000 |
| commit | 91b34f1a57213c1806bef6cdbd8ca113b65fe671 (patch) | |
| tree | 398267f9d17e70b4754f7429eee3e157612a9188 /external/icu | |
| parent | gdb pretty printers: fix the SwXTextCursor::Impl one even more (diff) | |
| download | core-91b34f1a57213c1806bef6cdbd8ca113b65fe671.tar.gz core-91b34f1a57213c1806bef6cdbd8ca113b65fe671.zip | |
static icu tweaking
Change-Id: Ic882b4d1a5b5eaee9e8c38a0c8dbe7cd39590b9c
Reviewed-on: https://gerrit.libreoffice.org/32219
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/icu')
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index d5d98ff6e31c..97f39751c4d9 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -83,12 +83,10 @@ $(call gb_ExternalProject_get_state_target,icu,build) : $(if $(filter ANDROID EMSCRIPTEN,$(OS)),--disable-strict ac_cv_c_bigendian=no) \ $(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),\ - --enable-static --disable-shared,\ + --with-data-packaging=static --enable-static --disable-shared --disable-dyload,\ --disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\ --with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \ - $(if $(filter IOS,$(OS)), \ - --with-data-packaging=archive) \ && $(MAKE) \ $(if $(filter MACOSX,$(OS)), \ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \ |