nobu	2016-10-18 15:55:15 +0900 (Tue, 18 Oct 2016)

  New Revision: 56444

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

  Log:
    separated_version.mk: option for linux [ci skip]
    
    * defs/separated_version.mk (RUBY_VERSION_DLDFLAGS): move linux
      specific option.

  Modified files:
    trunk/defs/separated_version.mk
Index: defs/separated_version.mk
===================================================================
--- defs/separated_version.mk	(revision 56443)
+++ defs/separated_version.mk	(revision 56444)
@@ -9,7 +9,7 @@ RUBY_VERSION_SO = $(subst ruby,ruby_vers https://github.com/ruby/ruby/blob/trunk/defs/separated_version.mk#L9
 RUBY_VERSION_DLDFLAGS := $(patsubst @executable_path/%/$(LIBRUBY_SO),@loader_path/$(RUBY_VERSION_SO),$(DLDFLAGS)) -exported_symbol=Init_version
 else ifneq ($(findstring -soname,$(DLDFLAGS)),)
 RUBY_VERSION_SO = $(subst ruby,ruby_version,$(LIBRUBY_SO))
-RUBY_VERSION_DLDFLAGS := $(subst ruby,ruby_version,$(DLDFLAGS))
+RUBY_VERSION_DLDFLAGS := $(subst ruby,ruby_version,$(DLDFLAGS)) -Wl,-rpath-link,'$${ORIGIN}'
 else
 ERROR
 endif
@@ -28,7 +28,7 @@ $(LIBRUBY_SO): $(RUBY_VERSION_SO) https://github.com/ruby/ruby/blob/trunk/defs/separated_version.mk#L28
 
 $(RUBY_VERSION_SO): version.$(OBJEXT)
 	$(ECHO) linking shared-library $@
-	$(LDSHARED) $(RUBY_VERSION_DLDFLAGS) -Wl,-rpath-link,'$${ORIGIN}' version.$(OBJEXT) $(OUTFLAG)$@
+	$(LDSHARED) $(RUBY_VERSION_DLDFLAGS) version.$(OBJEXT) $(OUTFLAG)$@
 	-$(Q) $(MINIRUBY) -e 'ARGV.each{|link|' \
 		-e   'File.delete link rescue nil' \
 		-e   'File.symlink "$(RUBY_VERSION_SO)", link' \

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