[Libreoffice-commits] .: sal/CustomTarget_generated.mk

[Matus Kukan]

 sal/CustomTarget_generated.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 033cd1d41f0862f5c2798646359e8993c6f38fff
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Apr 1 00:49:46 2012 +0200

    sal: rtlbootstrap.mk was empty on cygwin
    
    This needs proper fix. It wasn't noticed because it was created by pipe
    before afd5eb1f04971edb083e47a2f9c2e9d77c9737c9 and last command
    succeeded, so make continued even if compilation failed.

diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk
index a70acd3..b968acc 100644
--- a/sal/CustomTarget_generated.mk
+++ b/sal/CustomTarget_generated.mk
@@ -33,7 +33,12 @@ $(call gb_CustomTarget_get_target,sal/generated) : \
 	$(SAUT)/rtlbootstrap.mk $(SAUT)/sal/udkversion.h \
 	$(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h)
 
-$(SAUT)/rtlbootstrap.mk : $(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h) | $(SAUT)/.dir
+# FIXME: rtlbootstrap.mk is empty on cygwin
+ifeq ($(COM),MSC)
+$(SAUT)/rtlbootstrap.mk :| $(SAUT)/.dir
+	touch $@
+else
+$(SAUT)/rtlbootstrap.mk : $(SAUT)/sal/typesizes.h | $(SAUT)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CXX,1)
 	$(call gb_Helper_abbreviate_dirs_native, \
 	(echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > $(SAUT)/bootstrap.cxx && \
@@ -41,6 +46,7 @@ $(SAUT)/rtlbootstrap.mk : $(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h)
 		-I$(SRCDIR)/sal/inc $(SAUT)/bootstrap.cxx > $@.tmp && \
 	cat $@.tmp | grep '^RTL_' | sed -e 's/"//g' > $@ && \
 	rm $(SAUT)/bootstrap.cxx $@.tmp)
+endif
 
 $(SAUT)/sal/typesizes.h :| $(SAUT)/sal/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)