aboutsummaryrefslogtreecommitdiffstats
path: root/common.mk
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-11-12 16:35:01 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-11-12 16:36:56 +0900
commitfb02e3192cef96284501c82dfa024ea8a2b0ea80 (patch)
treed889f69f98754b55ae73b82c539893ebfd622874 /common.mk
parent14db635097ef89a299531770ba8ed5800a58ab8f (diff)
downloadruby-fb02e3192cef96284501c82dfa024ea8a2b0ea80.tar.gz
Create `RUBYCOMMONDIR` directory in advance
As well as the directory per architecture. Closes https://github.com/ruby/ruby/pull/2669
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index dd6f0c450a..718920ea64 100644
--- a/common.mk
+++ b/common.mk
@@ -58,6 +58,7 @@ DOCLIE_GIT_REF = v1.3.2
STATIC_RUBY = static-ruby
TIMESTAMPDIR = $(EXTOUT)/.timestamp
+RUBYCOMMONDIR = $(EXTOUT)/common
EXTCONF = extconf.rb
LIBRUBY_EXTS = ./.libruby-with-ext.time
REVISION_H = ./.revision.time
@@ -271,7 +272,8 @@ EXTS_NOTE = -f $(EXTS_MK) $(mflags) RUBY="$(MINIRUBY)" top_srcdir="$(srcdir)" no
exts: build-ext
EXTS_MK = exts.mk
-$(EXTS_MK): ext/configure-ext.mk $(TIMESTAMPDIR)/$(arch)/.time $(srcdir)/template/exts.mk.tmpl
+$(EXTS_MK): ext/configure-ext.mk $(srcdir)/template/exts.mk.tmpl \
+ $(TIMESTAMPDIR)/$(arch)/.time $(TIMESTAMPDIR)/.RUBYCOMMONDIR.time
$(Q)$(MAKE) -f ext/configure-ext.mk $(mflags) V=$(V) EXTSTATIC=$(EXTSTATIC) \
gnumake=$(gnumake) MINIRUBY="$(MINIRUBY)" \
EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)"
@@ -900,6 +902,10 @@ $(TIMESTAMPDIR)/$(arch)/.time:
$(Q)$(MAKEDIRS) $(@D) $(EXTOUT)/$(arch)
@$(NULLCMD) > $@
+$(TIMESTAMPDIR)/.RUBYCOMMONDIR.time:
+ $(Q)$(MAKEDIRS) $(@D) $(RUBYCOMMONDIR)
+ @$(NULLCMD) > $@
+
###
CCAN_DIR = {$(VPATH)}ccan