From cc3bbd3f1a796e326635bf8594e27d0c1eeb38f4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 12 Jun 2011 19:25:58 +0300 Subject: [PATCH] Bypass when cross-compiling, at least for now --- test/source/cpp/makefile.mk | 6 ++++++ test/source/cpp/unoexceptionprotector/makefile.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk index cae88e039574..62a6e2c35019 100644 --- a/test/source/cpp/makefile.mk +++ b/test/source/cpp/makefile.mk @@ -32,6 +32,12 @@ VISIBILITY_HIDDEN = TRUE .INCLUDE: settings.mk +.IF "$(CROSS_COMPILING)"=="YES" +all: + @echo Nothing done when cross-compiling +.ENDIF + +# --- Files -------------------------------------------------------- CDEFS += -DOOO_DLLIMPLEMENTATION_TEST CFLAGSCXX += $(CPPUNIT_CFLAGS) diff --git a/test/source/cpp/unoexceptionprotector/makefile.mk b/test/source/cpp/unoexceptionprotector/makefile.mk index 86c8bc6fb49e..d3d13e646232 100644 --- a/test/source/cpp/unoexceptionprotector/makefile.mk +++ b/test/source/cpp/unoexceptionprotector/makefile.mk @@ -32,6 +32,12 @@ VISIBILITY_HIDDEN = TRUE .INCLUDE: settings.mk +.IF "$(CROSS_COMPILING)"=="YES" +all: + @echo Nothing done when cross-compiling +.ENDIF + +# --- Files -------------------------------------------------------- DLLPRE = CFLAGSCXX += $(CPPUNIT_CFLAGS)