[前][次][番号順一覧][スレッド一覧]

ruby-changes:58743

From: Nobuyoshi <ko1@a...>
Date: Tue, 12 Nov 2019 16:37:36 +0900 (JST)
Subject: [ruby-changes:58743] fb02e3192c (master): Create `RUBYCOMMONDIR` directory in advance

https://git.ruby-lang.org/ruby.git/commit/?id=fb02e3192c

From fb02e3192cef96284501c82dfa024ea8a2b0ea80 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 12 Nov 2019 16:35:01 +0900
Subject: Create `RUBYCOMMONDIR` directory in advance

As well as the directory per architecture.

Closes https://github.com/ruby/ruby/pull/2669

diff --git a/common.mk b/common.mk
index dd6f0c4..718920e 100644
--- a/common.mk
+++ b/common.mk
@@ -58,6 +58,7 @@ DOCLIE_GIT_REF = v1.3.2 https://github.com/ruby/ruby/blob/trunk/common.mk#L58
 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 https://github.com/ruby/ruby/blob/trunk/common.mk#L272
 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: https://github.com/ruby/ruby/blob/trunk/common.mk#L902
 	$(Q)$(MAKEDIRS) $(@D) $(EXTOUT)/$(arch)
 	@$(NULLCMD) > $@
 
+$(TIMESTAMPDIR)/.RUBYCOMMONDIR.time:
+	$(Q)$(MAKEDIRS) $(@D) $(RUBYCOMMONDIR)
+	@$(NULLCMD) > $@
+
 ###
 CCAN_DIR = {$(VPATH)}ccan
 
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]