From 444d0910056ce7f770b81f1bd50bbcbec85c3f37 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 24 Sep 2017 10:07:21 +0000
Subject: common.mk: force link exe/ruby

* common.mk (exe/ruby): force link exe/ruby with miniruby.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'common.mk')

diff --git a/common.mk b/common.mk
index 18c26ea9e8..cda48c8179 100644
--- a/common.mk
+++ b/common.mk
@@ -777,9 +777,15 @@ $(PLATFORM_D):
 	$(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D)
 	@exit > $@
 
-exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time
+exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time miniruby$(EXEEXT)
 	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(@F) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ $<
-	$(Q) $(@) -e 'ARGV[0]=="ruby" or File.symlink(ARGV[0], ARGV[1]+"/ruby")' $(@F) $(@D)
+	$(Q) ./miniruby$(EXEEXT) \
+	    -e 'prog, dest = ARGV; dest += "/ruby"' \
+	    -e 'unless prog=="ruby"' \
+	    -e '  begin File.unlink(dest); rescue Errno::ENOENT; end' \
+	    -e '  File.symlink(prog, dest)' \
+	    -e 'end' \
+	$(@F) $(@D)
 
 exe/.time:
 	$(Q) $(MAKEDIRS) exe $(@D)
-- 
cgit v1.2.3