diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-17 17:40:49 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-17 17:46:15 +0200 |
| commit | 6f55d5eaec48212f24bd19b351ddedac3059eb8b (patch) | |
| tree | 6cc0967408a24c26a856d182d8fc54ce5edcb42e /testtools/source | |
| parent | 5057892990b310d59d25b161ee54273951afaa91 (diff) | |
Do build stuff here also when cross-compiling (but don't run)
Diffstat (limited to 'testtools/source')
| -rw-r--r-- | testtools/source/bridgetest/idl/makefile.mk | 5 | ||||
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk index dce276e4e855..8b172736adef 100644 --- a/testtools/source/bridgetest/idl/makefile.mk +++ b/testtools/source/bridgetest/idl/makefile.mk @@ -31,11 +31,6 @@ TARGET := bridgetest_idl .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - .INCLUDE: target.mk .IF "$(L10N_framework)"=="" diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 6481abc3a2c5..8d2f21b25d31 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -36,11 +36,6 @@ LIBTARGET=NO .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - .IF "$(L10N_framework)"=="" DLLPRE = # no leading "lib" on .so files @@ -141,6 +136,7 @@ ALLTAR: \ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \ $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) +.IF "$(CROSS_COMPILING)"!="YES" .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" @echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me." .ELSE @@ -149,6 +145,7 @@ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \ -s com.sun.star.test.bridge.BridgeTest -- \ com.sun.star.test.bridge.CppTestObject .ENDIF +.ENDIF $(DLLDEST)/services.rdb : $(COPY) $(SOLARXMLDIR)/ure/services.rdb $@ |