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

ruby-changes:55527

From: Takashi <ko1@a...>
Date: Thu, 25 Apr 2019 19:43:33 +0900 (JST)
Subject: [ruby-changes:55527] Takashi Kokubun:3581a64239 (trunk): BSD's mktemp does not have `-p`

From 3581a64239b333be33424888f689c9e452fc3334 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Thu, 25 Apr 2019 19:37:10 +0900
Subject: BSD's mktemp does not have `-p`


diff --git a/defs/gmake.mk b/defs/gmake.mk
index 80b9b34..306e242 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -188,7 +188,7 @@ merge-github: fetch-github https://github.com/ruby/ruby/blob/trunk/#L188
 define merge-github
 	$(eval GITHUB_MERGE_BASE := $(shell git -C "$(srcdir)" log -1 --format=format:%H))
 	$(eval GITHUB_MERGE_BRANCH := $(shell git -C "$(srcdir)" symbolic-ref --short HEAD))
-	$(eval GITHUB_MERGE_WORKTREE := $(shell mktemp -p "$(srcdir)" -d gh-$(1)-XXXXXX))
+	$(eval GITHUB_MERGE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(1)-XXXXXX"))
 	git -C "$(srcdir)" worktree add $(notdir $(GITHUB_MERGE_WORKTREE)) "gh-$(1)"
 	git -C "$(GITHUB_MERGE_WORKTREE)" rebase $(GITHUB_MERGE_BRANCH)
 	git -C "$(srcdir)" worktree remove $(notdir $(GITHUB_MERGE_WORKTREE))
-- 
cgit v0.10.2


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

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