summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-10-25 00:47:22 +0300
committerTor Lillqvist <tml@collabora.com>2013-10-25 00:48:12 +0300
commitb7e5ab6f65eb682bfa200459d745d3bc4056e42a (patch)
tree95b8ffd5d0e63dfdbe541198999c05ab0f31fdfa
parenta9759f706b0abd202e704004bdfa7b69fe93bbd0 (diff)
No libs in solver now any more
Change-Id: I6f0f91c5fdb467fea2c706b4d426a973277c5230
-rw-r--r--solenv/gbuild/platform/IOS_ARM_GCC.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index aac083b0aec5..96cfb5dbd7c3 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -117,13 +117,13 @@ 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 $(OUTDIR)/lib/*.a) \
$(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
$(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) \
@@ -132,6 +132,9 @@ define gb_LinkTarget__command_dynamiclink
$(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) \
$(T_LIBS) \