Skip to content

Commit

Permalink
separated_version.mk: option for linux [ci skip]
Browse files Browse the repository at this point in the history
* defs/separated_version.mk (RUBY_VERSION_DLDFLAGS): move linux
  specific option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Oct 18, 2016
1 parent fed0664 commit 5f69a2e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions defs/separated_version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUBY_VERSION_SO = $(subst ruby,ruby_version,$(LIBRUBY_SO))
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
Expand All @@ -28,7 +28,7 @@ $(LIBRUBY_SO): $(RUBY_VERSION_SO)

$(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' \
Expand Down

0 comments on commit 5f69a2e

Please sign in to comment.