From 1c69052b5218448e91813eb2ad1e60820639b300 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 13 Sep 2011 11:30:58 +0300 Subject: 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. --- cppu/qa/makefile.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cppu/qa') 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) -- cgit