diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-12 23:14:01 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-13 13:33:50 +0100 |
| commit | 481bc6cf3d8ab8b7f37c709bbe4e7f83b60ef8ec (patch) | |
| tree | 820864981bb467ff58109522efee86564ba1bcc9 /solenv | |
| parent | NOMINMAX on Windows is defined globally (diff) | |
| download | core-481bc6cf3d8ab8b7f37c709bbe4e7f83b60ef8ec.tar.gz core-481bc6cf3d8ab8b7f37c709bbe4e7f83b60ef8ec.zip | |
substitute BUILDDIR in gb_Helper_abbreviate_dirs too
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index f81a6b4df561..25cf47fc0f5a 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -38,12 +38,22 @@ gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY $(gb_Helper_MISCDUMMY) : @mkdir -p $(dir $@) && touch $@ +ifeq ($(SRCDIR),$(BUILDDIR)) define gb_Helper_abbreviate_dirs S=$(SRCDIR) && \ $(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \ $(subst $(SRCDIR)/,$$S/,W=$(WORKDIR)) && \ $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1)))) endef +else +define gb_Helper_abbreviate_dirs +S=$(SRCDIR) && \ +$(subst $(SRCDIR)/,$$S/,B=$(BUILDDIR)) && \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,O=$(OUTDIR))) && \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,W=$(WORKDIR))) && \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1))))) +endef +endif define gb_Helper_abbreviate_dirs_native $(call gb_Output_error,gb_Helper_abbreviate_dirs_native: use gb_Helper_abbreviate_dirs instead.) |