diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-11-22 16:43:45 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-11-22 16:43:59 +0200 |
commit | eda27039c157c1102209d242670d5a622242827e (patch) | |
tree | 96acf5d6487d5002d37224eec66e8d4b16dc0630 /solenv | |
parent | e04d21afee4a286d63f836e7375d573dd4b7f73a (diff) |
Use the lo-all-static-libs script
Change-Id: Ifa9d755ff223f310881cece4d6dcfdd690ee8c78
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index ca5c3c8a9864..59923e907e53 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -117,28 +117,7 @@ define gb_LinkTarget__command_dynamiclink $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ - $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \ - $(EBOOK_LIBS) \ - $(FREEHAND_LIBS) \ - $(HUNSPELL_LIBS) \ - $(HYPHEN_LIB) \ - $(MYTHES_LIBS) \ - $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/libodfgen/src/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/liborcus/src/*/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/redland/src/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/xml2/.libs/*.a) \ - $(wildcard $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs/*.a) \ + $(shell $(SRCDIR)/bin/lo-all-static-libs) \ $(T_LIBS) \ -o $(1)) endef |