archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Bug #20800] Move executable binary file path

Browse source 
From under "libexec", under `$(target)/bin` like as binutils.
This commit is contained in:
Nobuyoshi Nakada 2024-11-09 19:58:44 +09:00
parent 303a52c201
commit 379bbd6d9c
No known key found for this signature in database
GPG key ID: 3582D74E1FEE4465
Notes: git 2024-11-09 12:50:57 +00:00
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tool/mkrunnable.rb
View file

@ -34,7 +34,10 @@ vendordir = config["vendordir"]
rubylibdir = config["rubylibdir"] rubylibdir = config["rubylibdir"]
rubyarchdir = config["rubyarchdir"] rubyarchdir = config["rubyarchdir"]
archdir = "#{extout}/#{arch}" archdir = "#{extout}/#{arch}"
exedir = libdirname == "archlibdir" ? "#{config["libexecdir"]}/#{arch}" : bindir exedir = bindir
if libdirname == "archlibdir"
exedir = exedir.sub(%r[/\K(?=[^/]+\z)]) {extout+"/"}
end
[exedir, libdir, archdir].uniq.each do |dir| [exedir, libdir, archdir].uniq.each do |dir|
File.directory?(dir) or mkdir_p(dir) File.directory?(dir) or mkdir_p(dir)
end end

6
tool/rbinstall.rb
View file

@ -367,11 +367,7 @@ goruby_install_name = "go" + ruby_install_name
bindir = CONFIG["bindir", true] bindir = CONFIG["bindir", true]
if CONFIG["libdirname"] == "archlibdir" if CONFIG["libdirname"] == "archlibdir"
libexecdir = MAKEFILE_CONFIG["archlibdir"].dup archbindir = bindir.sub(%r[/\K(?=[^/]+\z)]) {CONFIG["target"] + "/"}
unless libexecdir.sub!(/\$\(lib\K(?=dir\))/) {"exec"}
libexecdir = "$(libexecdir)/$(arch)"
end
archbindir = RbConfig.expand(libexecdir)
end end
libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true] libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
rubyhdrdir = CONFIG["rubyhdrdir", true] rubyhdrdir = CONFIG["rubyhdrdir", true]