diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-01 00:49:46 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-01 00:49:46 +0200 |
| commit | 033cd1d41f0862f5c2798646359e8993c6f38fff (patch) | |
| tree | ec326c7cdd9da43229f7602050e74877b90a7a76 /sal | |
| parent | 7d3cc4b95e4a7dfaefd5538b491534d6690f7d5b (diff) | |
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.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/CustomTarget_generated.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk index a70acd390fcd..b968acc6478b 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) |