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

Revert "LTO fixes for android"

Browse Source 
Seems to break the tinderbox, needs more work?

This reverts commit 6aaf1ec5a7.
This commit is contained in:
Tor Lillqvist
2016-01-19 00:56:40 +02:00
parent 6aaf1ec5a7
commit a28fc0ea2f
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/libxml2/ExternalProject_xml2.mk vendored
View File

@@ -48,7 +48,6 @@ $(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,12 +20,6 @@ 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 := :