summaryrefslogtreecommitdiff
path: root/defs/separated_version.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-10-18 06:55:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-10-18 06:55:15 +0000
commit5f69a2e5a410fa5487cc3e2b1a051391a20d6ea0 (patch)
treeaeafdc7c758ab8b60a18266134fa8f364a6da3da /defs/separated_version.mk
parentfed06646e7e83a9167169cc669546c5ca82a2353 (diff)
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/separated_version.mk')
-rw-r--r--defs/separated_version.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/defs/separated_version.mk b/defs/separated_version.mk
index 9211b11..f086f4b 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' \