From 8d83508ec3a5238d0bfa1992166f9af02942ca4e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 00:33:04 +0300 Subject: Bypass qa thingies for now when cross-compiling --- cppuhelper/qa/ifcontainer/makefile.mk | 5 +++++ cppuhelper/qa/propertysetmixin/makefile.mk | 5 +++++ cppuhelper/qa/unourl/makefile.mk | 5 +++++ cppuhelper/qa/weak/makefile.mk | 5 +++++ 4 files changed, 20 insertions(+) (limited to 'cppuhelper') diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk index 6f3476aa48c7..5284f4b082aa 100644 --- a/cppuhelper/qa/ifcontainer/makefile.mk +++ b/cppuhelper/qa/ifcontainer/makefile.mk @@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(CROSS_COMPILING)"=="YES" +all: + @echo Nothing done when cross-compiling +.ENDIF + CFLAGSCXX += $(CPPUNIT_CFLAGS) # BEGIN ---------------------------------------------------------------- diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index 04aa2479c3b8..be4cfc380947 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -41,6 +41,11 @@ my_components = $(TARGET).cpp $(TARGET).java .INCLUDE: settings.mk +.IF "$(CROSS_COMPILING)"=="YES" +all: + @echo Nothing done when cross-compiling +.ENDIF + .IF "$(OS)" == "WNT" my_file = file:/// .ELSE diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk index 4e46dd088b93..f48b724ee24b 100644 --- a/cppuhelper/qa/unourl/makefile.mk +++ b/cppuhelper/qa/unourl/makefile.mk @@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(CROSS_COMPILING)"=="YES" +all: + @echo Nothing done when cross-compiling +.ENDIF + CFLAGSCXX += $(CPPUNIT_CFLAGS) # BEGIN ---------------------------------------------------------------- diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk index 5116886b671c..7895504970bc 100644 --- a/cppuhelper/qa/weak/makefile.mk +++ b/cppuhelper/qa/weak/makefile.mk @@ -33,6 +33,11 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk +.IF "$(CROSS_COMPILING)"=="YES" +all: + @echo Nothing done when cross-compiling +.ENDIF + CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = # no leading "lib" on .so files -- cgit