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

Tor Lillqvist tml at kemper.freedesktop.org
Mon May 14 00:31:14 PDT 2012


 sal/CustomTarget_generated.mk |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f5ea2b5fa85660844daf092e84db45a759bf126d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon May 14 10:25:35 2012 +0300

    Generate a proper (?) rtlbootstrap.mk for a MSC build, too
    
    Change-Id: I35a1a270f5eab2250ed0ef50c6bf6c9dbec4f42e

diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk
index 175780f..5b11927 100644
--- a/sal/CustomTarget_generated.mk
+++ b/sal/CustomTarget_generated.mk
@@ -33,10 +33,14 @@ $(call gb_CustomTarget_get_target,sal/generated) : \
 	$(sal_DIR)/rtlbootstrap.mk $(sal_DIR)/sal/udkversion.h \
 	$(if $(filter-out $(COM),MSC),$(sal_DIR)/sal/typesizes.h)
 
-# FIXME: rtlbootstrap.mk is empty on cygwin
 ifeq ($(COM),MSC)
 $(sal_DIR)/rtlbootstrap.mk :| $(sal_DIR)/.dir
-	touch $@
+	echo RTL_OS:=Windows > $@
+ifeq ($(CPUNAME),INTEL)
+	echo RTL_ARCH:=x86 >> $@
+else
+	echo RTL_ARCH:=X86_64 >> $@
+endif
 else
 $(sal_DIR)/rtlbootstrap.mk : $(sal_DIR)/sal/typesizes.h | $(sal_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CXX,1)


More information about the Libreoffice-commits mailing list