diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-09-19 20:56:24 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-09-19 20:59:56 +0300 |
| commit | 6ac7b46651fbb7aae9a7d8db32a3e1f07087b3ee (patch) | |
| tree | 3716491bd879ebbe857ffabf14c506331ecfdcf2 /bin | |
| parent | dea5a217f04159afca33e27b3ac5e6d6c4f550a0 (diff) | |
If we don't want any NSS crack on iOS then don't try to use libs from there
Change-Id: I9265ee3ce46d8d2e5af4759e8d9748bd39a3e665
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lo-all-static-libs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index 8cef48656c5f..effa190a1027 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -46,17 +46,6 @@ IOS) oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a" oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/.libs/*.a" oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/nss/.libs/*.a" - - # The NSS dylibs (which we don't build for iOS) are constructed - # from a bunch of static archives and some freestanding object - # files (that are not present in any of the static archives). We - # need the latter too, so collect them here into an archive of - # their own. - ar cr $WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/libLOtemp.a \ - $WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/*.o \ - $WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/Darwin_SINGLE_SHLIB/*.o - - nsslibs=`find $WORKDIR/UnpackedTarball/nss -name 'lib*.a'` ;; *) oslibs= @@ -67,7 +56,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $foolibs \ $WORKDIR/LinkTarget/StaticLibrary/lib*.a \ $oslibs \ - $nsslibs \ $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \ $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a \ $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a \ |