From 6f55d5eaec48212f24bd19b351ddedac3059eb8b Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Thu, 17 Nov 2011 17:40:49 +0200
Subject: Do build stuff here also when cross-compiling (but don't run)

---
 testtools/com/sun/star/comp/bridge/makefile.mk | 5 -----
 testtools/source/bridgetest/idl/makefile.mk    | 5 -----
 testtools/source/bridgetest/makefile.mk        | 7 ++-----
 3 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'testtools')

diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk
index 0a6b9a8c1868..7083f2381698 100644
--- a/testtools/com/sun/star/comp/bridge/makefile.mk
+++ b/testtools/com/sun/star/comp/bridge/makefile.mk
@@ -34,11 +34,6 @@ TARGET=com_sun_star_comp_bridge
 
 .INCLUDE :  settings.mk
 
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
 # ------------------------------------------------------------------
 
 .IF "$(SOLAR_JAVA)" != ""
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 $@
-- 
cgit