diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-02 02:41:06 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-02 02:41:06 +0000 |
commit | d1cc0ebb38a23feb37bb16ff2df3137c3cead069 (patch) | |
tree | b9ee3b030d2864da8e7d8ef1c5a341d79adfda2f /tool | |
parent | 243e581db047a4210bd5c77966729eeda4bb020f (diff) | |
download | ruby-d1cc0ebb38a23feb37bb16ff2df3137c3cead069.tar.gz |
mkrunnable.rb: fix DLL path on Windows
* tool/mkrunnable.rb: DLL needs placed at same directory as
executables on Windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/mkrunnable.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tool/mkrunnable.rb b/tool/mkrunnable.rb index 82de4eee13..7d374182c6 100755 --- a/tool/mkrunnable.rb +++ b/tool/mkrunnable.rb @@ -104,7 +104,13 @@ goruby_install_name = "go" + ruby_install_name ln_relative(ruby, "#{bindir}/#{ruby}") end end -libruby = config.values_at("LIBRUBY_A", "LIBRUBY_SO") +so = config["LIBRUBY_SO"] +libruby = [config["LIBRUBY_A"]] +if /\.dll\z/i =~ so + ln_relative(so, "#{bindir}/#{so}") +else + libruby << so +end libruby.concat(config["LIBRUBY_ALIASES"].split) libruby.each {|lib|ln_relative(lib, "#{libdir}/#{lib}")} ln_dir_relative("#{extout}/common", rubylibdir) |