mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LTO fixes for android

Browse Source 
Change-Id: I2d4cedac4081260c5147d8c11904d042c765e3a6
Reviewed-on: https://gerrit.libreoffice.org/21557
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Peter Foley
2016-01-17 18:13:25 -05:00
committed by Tor Lillqvist
parent af6a39120f
commit 6aaf1ec5a7
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/libxml2/ExternalProject_xml2.mk vendored
View File

@@ -48,6 +48,7 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \
LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \ LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \
CFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g)" \ CFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g)" \
AR_FLAGS="$(AR_FLAGS)" \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
&& $(MAKE) \ && $(MAKE) \
) )

6
solenv/gbuild/platform/android.mk
View File

@@ -20,6 +20,12 @@ gb_STDLIBS := \
endif endif
ifeq ($(ENABLE_LTO),TRUE)
gb_LTOPLUGINFLAGS := --plugin $(shell $(CC) --print-prog-name=liblto_plugin.so)
AR_FLAGS := rcs --plugin $(shell $(CC) --print-prog-name=liblto_plugin.so)
RANLIB := $(RANLIB) --plugin $(shell $(CC) --print-prog-name=liblto_plugin.so)
endif
# No unit testing can be run # No unit testing can be run
gb_CppunitTest_CPPTESTPRECOMMAND := : gb_CppunitTest_CPPTESTPRECOMMAND := :