strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sal: rtlbootstrap.mk was empty on cygwin

Browse source 
This needs proper fix. It wasn't noticed because it was created by pipe
before afd5eb1f04 and last command
succeeded, so make continued even if compilation failed.
This commit is contained in:
Matúš Kukan 2012-04-01 00:49:46 +02:00
parent 7d3cc4b95e
commit 033cd1d41f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sal/CustomTarget_generated.mk
View file

@ -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)