[Libreoffice-commits] core.git: sal/Module_sal.mk

Michael Stahl mstahl at redhat.com
Mon May 11 08:53:39 PDT 2015


 sal/Module_sal.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 26ebcb023ef3d38956085cbb39416e6f148ab351
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon May 11 17:45:01 2015 +0200

    sal: don't build cppunittester if cross-compiling
    
    Change-Id: I4e2d884b2f87572dc22fece897e384bdaa7506cc

diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 2cfbaee..bccabe7 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -10,8 +10,7 @@
 $(eval $(call gb_Module_Module,sal))
 
 $(eval $(call gb_Module_add_targets,sal,\
-	$(if $(filter DESKTOP,$(BUILD_TYPE)), \
-		Executable_cppunittester) \
+	$(if $(CROSS_COMPILING),,Executable_cppunittester) \
 	$(if $(filter $(OS),ANDROID), \
 		Library_lo-bootstrap) \
 	Library_sal \


More information about the Libreoffice-commits mailing list