summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-09-13 11:30:58 +0300
committerTor Lillqvist <tml@iki.fi>2011-09-20 16:59:05 +0300
commit1c69052b5218448e91813eb2ad1e60820639b300 (patch)
treecb3e07214d642968af1317fd6c11b6a78a481965 /cppu
parent6f65af360c94a9649f6411d2954d8a15ecbfa837 (diff)
Bypass building the iOS cppu_unittester_all for now
We can't build it here at this point during the build after all. We use static linking on iOS, and we would need to link with -lgcc3_uno from bridges which has not been built yet. It seems that any meaningful unit tests for iOS actually need to be built in a "subsequent" stage.
Diffstat (limited to 'cppu')
-rw-r--r--cppu/qa/makefile.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index 9d3d5c207534..2dee9913153f 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -73,7 +73,12 @@ DEF4NAME = $(SHL4TARGET)
SLOFILES = $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS)
-.IF "$(OS)" == "IOS"
+.IF "$(OS)" == "IOS no thanks for now"
+# Nah, we can't build this here for iOS after all, thanks to having to
+# use static linking, we would need to link with -lgcc3_uno from
+# bridges which has not been built yet (and which in fact depends on
+# cppu...) Seems that any meaningful unit test for iOS actually needs
+# to be built in the "subsequent" stage.
APP5OBJS = $(OBJ)/cppu_cppunittester_all.obj $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS)
APP5RPATH = NONE
APP5STDLIBS = $(CPPUNITLIB) $(CPPULIB) $(SALLIB)