diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-18 06:55:15 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-18 06:55:15 +0000 |
| commit | 00ba70f7e7c6935a099a9fce3272c0defa64df2d (patch) | |
| tree | aeafdc7c758ab8b60a18266134fa8f364a6da3da /defs | |
| parent | 358f83e747aea3216c337309151263620a42d2e4 (diff) | |
| download | ruby-00ba70f7e7c6935a099a9fce3272c0defa64df2d.tar.gz | |
separated_version.mk: option for linux [ci skip]
* 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
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/separated_version.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/defs/separated_version.mk b/defs/separated_version.mk index 9211b117f5..f086f4b24a 100644 --- a/defs/separated_version.mk +++ b/defs/separated_version.mk @@ -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 @@ -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' \ |