From 45e8d96df39f45a7fe7b56f8d0f8fc181b0f1e46 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 19 Dec 2014 10:42:35 +0200 Subject: [PATCH] Fix fallout from a2e4be6ded508030a6c2a33919cbe8cb504382e0 Should fix build for iOS. There is no liblibotouch.a any more, and the only library in $WORKDIR/LinkTarget/Library turns out to be the Android-only liblo-bootstrap.a now. Change-Id: Ia7b2f43db06536c05caee8d99130f44d5288705e --- bin/lo-all-static-libs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index bbe950c0f0e1..8cef48656c5f 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -39,6 +39,8 @@ ANDROID) oslibs="$WORKDIR/UnpackedTarball/curl/lib/.libs/*.a" oslibs="$oslibs $WORKDIR/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a" oslibs="$oslibs $WORKDIR/UnpackedTarball/freetype/objs/.libs/libfreetype.a" + # Only liblo-bootstrap.a ends up here: + oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a" ;; IOS) oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a" @@ -64,7 +66,6 @@ esac echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $foolibs \ $WORKDIR/LinkTarget/StaticLibrary/lib*.a \ - $WORKDIR/LinkTarget/Library/lib*.a \ $oslibs \ $nsslibs \ $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \