Kaydet (Commit) 85c2f280 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert "i hope this is fixed now"

This reverts commit b8044cb8.

84dbc4fe fixed the bridge for PPC on Linux, not
Mac OS X.
üst 40813789
...@@ -146,11 +146,15 @@ ALLTAR: \ ...@@ -146,11 +146,15 @@ 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 "$(CROSS_COMPILING)"!="YES"
.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
@echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
.ELSE
cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \ cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
-ro uno_services.rdb -ro uno_types.rdb \ -ro uno_services.rdb -ro uno_types.rdb \
-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