[Libreoffice-commits] core.git: setup_native/Module_setup_native.mk

[Jan Holesovsky]

 setup_native/Module_setup_native.mk |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7820a13f6175e6da73c7ae937f075ea13ee83311
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Feb 28 18:47:48 2013 +0100

    MinGW: Build makecab.exe and friends only when WINEGCC is set.
    
    Change-Id: I37ed3c2ef456c4a258101a9f1ea9568798a6ce80

diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index 45f814f..966dc60 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\
 endif
 
 ifeq ($(OS),WNT)
-ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_targets,setup_native,\
         Library_instooofiltmsi \
 	Library_jfregca \
@@ -40,14 +39,18 @@ $(eval $(call gb_Module_add_targets,setup_native,\
 	StaticLibrary_quickstarter \
 	StaticLibrary_seterror \
 ))
+
 else
+
+ifneq ($(WINEGCC),)
+# this is supposed to be built on the _build_ platform, even though the
+# result is an .exe
 $(eval $(call gb_Module_add_targets,setup_native,\
 	CustomTarget_wintools \
 	Package_wintools \
 ))
 endif
 
-else
 $(eval $(call gb_Module_add_targets,setup_native,\
 	CustomTarget_scripts \
 	Package_scripts \