ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

ofz#10100 use --disable-release to avoid icu adding extra link flags

Browse Source 
so only use our passed in link flags, and so avoid failing under oss-fuzz with
linker problem

https://github.com/google/oss-fuzz/issues/1789

and revert the interim hackery to narrow down the problem

Change-Id: Ic92f65ac3895d36a2917281c260e177caf2d31f5
Reviewed-on: https://gerrit.libreoffice.org/60216
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2018-09-09 16:56:10 +02:00
parent 9026e254a6
commit f09836cae2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/icu/ExternalProject_icu.mk
Vendored
+2 -2
View File
@@ -65,8 +65,8 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \
CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
./configure \
ac_cv_namespace_ok=yes \
--disable-layout --disable-samples \
$(if $(filter FUZZERS,$(BUILD_TYPE)),--disable-release) \
$(if $(CROSS_COMPILING),--disable-tools --disable-extras) \
$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
$(if $(filter ANDROID,$(OS)),--disable-strict ac_cv_c_bigendian=no) \
@@ -75,7 +75,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
--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) || cat config.log \
--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \
&& $(MAKE) $(if $(CROSS_COMPILING),DATASUBDIR=data) \
$(if $(filter MACOSX,$(OS)), \
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \