[Libreoffice-commits] core.git: external/libxml2 solenv/gbuild

[Tor Lillqvist]

 external/libxml2/ExternalProject_xml2.mk |    1 -
 solenv/gbuild/platform/android.mk        |    6 ------
 2 files changed, 7 deletions(-)

New commits:
commit a28fc0ea2f533076f8573f07f9fa0ca7d6b7475a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 19 00:56:40 2016 +0200

    Revert "LTO fixes for android"
    
    Seems to break the tinderbox, needs more work?
    
    This reverts commit 6aaf1ec5a781b50ceda6d0d288a43dba435be2ce.

diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk
index 6d4822f..f19cb52 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -48,7 +48,6 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \
 			LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \
 			CFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g)" \
-			AR_FLAGS="$(AR_FLAGS)" \
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
 		&& $(MAKE) \
 	)
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index 55b6c5c..ae1a9ea 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -20,12 +20,6 @@ gb_STDLIBS := \
 
 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
 gb_CppunitTest_CPPTESTPRECOMMAND := :