Skip to content

Commit 9588319

Browse files
committed
[Bug #20800] Use config target for bin directory as-is
The "target" in `RbConfig::CONFIG` is being changed from config.sub to align to the system `uname`. Use the value modified by config.sub, and make the directory same as GNU utilities, such as binutils.
1 parent 379bbd6 commit 9588319

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ dnl checks for alternative programs
149149
AC_CANONICAL_BUILD
150150
AC_CANONICAL_HOST
151151
AC_CANONICAL_TARGET
152+
AC_SUBST(config_target, $target)
152153
AS_CASE(["$target_cpu-$target_os"],
153154
[aarch64-darwin*], [
154155
target_cpu=arm64

tool/rbinstall.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ def CONFIG.[](name, mandatory = false)
367367

368368
bindir = CONFIG["bindir", true]
369369
if CONFIG["libdirname"] == "archlibdir"
370-
archbindir = bindir.sub(%r[/\K(?=[^/]+\z)]) {CONFIG["target"] + "/"}
370+
archbindir = bindir.sub(%r[/\K(?=[^/]+\z)]) {CONFIG["config_target"] + "/"}
371371
end
372372
libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
373373
rubyhdrdir = CONFIG["rubyhdrdir", true]

0 commit comments

Comments
 (0)