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

ruby-changes:47893

From: nobu <ko1@a...>
Date: Sun, 24 Sep 2017 19:07:27 +0900 (JST)
Subject: [ruby-changes:47893] nobu:r60012 (trunk): common.mk: force link exe/ruby

nobu	2017-09-24 19:07:21 +0900 (Sun, 24 Sep 2017)

  New Revision: 60012

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60012

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

  Modified files:
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 60011)
+++ common.mk	(revision 60012)
@@ -777,9 +777,15 @@ $(PLATFORM_D): https://github.com/ruby/ruby/blob/trunk/common.mk#L777
 	$(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)

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

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