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

ruby-changes:56401

From: Nobuyoshi <ko1@a...>
Date: Tue, 9 Jul 2019 21:22:48 +0900 (JST)
Subject: [ruby-changes:56401] Nobuyoshi Nakada: b1be349bfb (master): Make symlink to "ruby" only from the install-name

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

From b1be349bfb327753d9f971c9ef692896fac7df08 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 9 Jul 2019 21:21:00 +0900
Subject: Make symlink to "ruby" only from the install-name


diff --git a/common.mk b/common.mk
index 928c595..8f123e5 100755
--- a/common.mk
+++ b/common.mk
@@ -867,12 +867,13 @@ exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time miniruby$(EXEEXT) {$(VPATH https://github.com/ruby/ruby/blob/trunk/common.mk#L867
 	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OUTFLAG)$@ ruby-runner.$(OBJEXT) $(LIBS)
 	$(Q) $(POSTLINK)
 	$(Q) ./miniruby$(EXEEXT) \
-	    -e 'prog, dest = ARGV; dest += "/ruby"' \
+	    -e 'prog, dest, inst = ARGV; dest += "/ruby"' \
+	    -e 'exit unless prog==inst' \
 	    -e 'unless prog=="ruby"' \
 	    -e '  begin File.unlink(dest); rescue Errno::ENOENT; end' \
 	    -e '  File.symlink(prog, dest)' \
 	    -e 'end' \
-	$(@F) $(@D)
+	$(@F) $(@D) $(RUBY_INSTALL_NAME)$(EXEEXT)
 
 exe/.time:
 	$(Q) $(MAKEDIRS) $(@D)
-- 
cgit v0.10.2


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

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