Kaydet (Commit) 6f55d5ea authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Do build stuff here also when cross-compiling (but don't run)

üst 50578929
...@@ -34,11 +34,6 @@ TARGET=com_sun_star_comp_bridge ...@@ -34,11 +34,6 @@ TARGET=com_sun_star_comp_bridge
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
all:
@echo Nothing done when cross-compiling
.ENDIF
# ------------------------------------------------------------------ # ------------------------------------------------------------------
.IF "$(SOLAR_JAVA)" != "" .IF "$(SOLAR_JAVA)" != ""
......
...@@ -31,11 +31,6 @@ TARGET := bridgetest_idl ...@@ -31,11 +31,6 @@ TARGET := bridgetest_idl
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
all:
@echo Nothing done when cross-compiling
.ENDIF
.INCLUDE: target.mk .INCLUDE: target.mk
.IF "$(L10N_framework)"=="" .IF "$(L10N_framework)"==""
......
...@@ -36,11 +36,6 @@ LIBTARGET=NO ...@@ -36,11 +36,6 @@ LIBTARGET=NO
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
all:
@echo Nothing done when cross-compiling
.ENDIF
.IF "$(L10N_framework)"=="" .IF "$(L10N_framework)"==""
DLLPRE = # no leading "lib" on .so files DLLPRE = # no leading "lib" on .so files
...@@ -141,6 +136,7 @@ ALLTAR: \ ...@@ -141,6 +136,7 @@ ALLTAR: \
runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
$(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
.IF "$(CROSS_COMPILING)"!="YES"
.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
@echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me." @echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
.ELSE .ELSE
...@@ -149,6 +145,7 @@ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \ ...@@ -149,6 +145,7 @@ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
-s com.sun.star.test.bridge.BridgeTest -- \ -s com.sun.star.test.bridge.BridgeTest -- \
com.sun.star.test.bridge.CppTestObject com.sun.star.test.bridge.CppTestObject
.ENDIF .ENDIF
.ENDIF
$(DLLDEST)/services.rdb : $(DLLDEST)/services.rdb :
$(COPY) $(SOLARXMLDIR)/ure/services.rdb $@ $(COPY) $(SOLARXMLDIR)/ure/services.rdb $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment