[Libreoffice-commits] .: fontconfig/ExternalProject_fontconfig.mk

[Libreoffice Gerrit user]

 fontconfig/ExternalProject_fontconfig.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f2c5dc6be09e372bc39757d786d32a326732c59
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Oct 30 14:03:42 2012 +0200

    Try to fix Android tinderbox build
    
    For some reason $(LIBS) seems to contain a bunch of unneeded libraries
    including -llo-bootstrap when we get here. Those won't be found by the
    basic configury as there are no -L switches included, causing the
    lovely "C compiler cannot create executables" problem.
    
    Change-Id: Id7cfba191bd16649c7948194eb7ebdbfbfb74f3e

diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
index 90107a1..294c6b2 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,fontconfig,\
 
 $(call gb_ExternalProject_get_state_target,fontconfig,build) :
 	cd $(EXTERNAL_WORKDIR) \
-	&& $(if $(debug),CFLAGS=-g) $(if $(filter ANDROID,$(OS)),LIBS="-lm $(LIBS)") ./configure \
+	&& $(if $(debug),CFLAGS=-g) $(if $(filter ANDROID,$(OS)),LIBS="-lm") ./configure \
 		--disable-shared \
 		--with-arch=arm \
 		--with-expat-includes=$(OUTDIR)/inc/external \