From a494a8329f211a37ff2d5b8fe28bbc8a0a3beb66 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 16 May 2013 14:38:39 +0200
Subject: use $(OS_FOR_BUILD) to fix mingw cross-compilation

Change-Id: I606e99e80ace5b086210e5a724a3e979e2b98cbf
---
 solenv/gbuild/Gallery.mk                   | 2 +-
 solenv/gbuild/extensions/pre_BuildTools.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'solenv')

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index a866a116f8e4..bf7d72ca91de 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -59,7 +59,7 @@ $(call gb_Output_announce,$(2),$(true),GAL,1)
 $(call gb_Helper_abbreviate_dirs,\
 	rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
 	$(call gb_Helper_print_on_error,\
-		$(if $(filter-out MACOSX WNT,$(OS)),SAL_USE_VCLPLUGIN=svp) \
+		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),SAL_USE_VCLPLUGIN=svp) \
 		$(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
 			$(call gb_Gallery__make_env_args) \
 			--build-tree \
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index 39dd1f5e9b97..b48f2c4c9960 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -8,7 +8,7 @@
 #
 
 
-ifeq (,$(filter WNT,$(OS)))
+ifeq (,$(filter WNT,$(OS_FOR_BUILD)))
 	gb_GENGAL = gengal.bin
 else # windows appends the .exe
 	gb_GENGAL = gengal
-- 
cgit