diff options
| -rw-r--r-- | external/libxml2/ExternalProject_xml2.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/android.mk | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk index f19cb529add7..6d4822f9d51e 100644 --- a/external/libxml2/ExternalProject_xml2.mk +++ b/external/libxml2/ExternalProject_xml2.mk @@ -48,6 +48,7 @@ $(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 ae1a9ea0b618..55b6c5c1aa10 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -20,6 +20,12 @@ 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 := : |