diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-10-06 09:20:22 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-10-06 09:34:59 +0200 |
| commit | eed96773b4adf7fdec74502ee89bca63b9018a80 (patch) | |
| tree | 8696b0ea6918bdbcc4d1679de2fbb03b23bda052 /bin | |
| parent | 60e7480535147bbfb1b000528510e66303c032fb (diff) | |
iOS, fixes for release build
removed coinmp (needed to update lo-all-static-libs)
convert CPUNAME to lowercase (needed by xcodebuild)
Change-Id: I13ccfbd6a6fd139db2745c1536192710afe094bb
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lo-all-static-libs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index 310c432fc0a6..97c5508c741d 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -46,6 +46,15 @@ ANDROID) # Only liblo-bootstrap.a ends up here: oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a" oslibs="$oslibs $WORKDIR/UnpackedTarball/openssl/*.a" + + # coinmp not used for iOS + oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a" + oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a" + oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a" + oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Clp/src/OsiClp/.libs/*.a" + oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a" + oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a" + oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a" ;; IOS) oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a" @@ -59,13 +68,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $foolibs \ $WORKDIR/LinkTarget/StaticLibrary/lib*.a \ $oslibs \ - $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \ - $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a \ - $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a \ - $WORKDIR/UnpackedTarball/coinmp/Clp/src/OsiClp/.libs/*.a \ - $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a \ - $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a \ - $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \ $WORKDIR/UnpackedTarball/icu/source/lib/*.a \ $WORKDIR/UnpackedTarball/libjpeg-turbo/.libs/*.a \ $WORKDIR/UnpackedTarball/liblangtag/liblangtag/.libs/*.a \ |