зеркало из https://github.com/github/ruby.git
Revert "[Bug #20499] Use consistent version tools with CC"
This reverts commit 8277cf0799
.
This change break to build with `rbenv install ruby-dev` with the following error.
```
touch yjit/target/release/libyjit.a
transdb.h updated
./tool/darwin-ar: line 6: /nm: No such file or directory
./tool/darwin-ar: line 6: exec: /nm: cannot execute: No such file or directory
partial linking yjit/target/release/libyjit.a into yjit/target/release/libyjit.o
```
This commit is contained in:
Родитель
b20adf90e3
Коммит
f8e6752219
14
configure.ac
14
configure.ac
|
@ -248,16 +248,10 @@ AS_CASE(["${build_os}"],
|
|||
AC_PATH_TOOL([NM], [nm], [/usr/ccs/bin/nm], [/usr/ccs/bin:$PATH])
|
||||
],
|
||||
[darwin*], [
|
||||
# As Apple Xcode is relocatable and selectable with `xcode-select`,
|
||||
# use consistent versions of commands in the same location.
|
||||
AC_MSG_CHECKING([Xcode tools])
|
||||
AS_CASE([$ac_cv_prog_ac_ct_CC],
|
||||
[/*], [],
|
||||
[ac_cv_prog_ac_ct_CC=`command -v $ac_cv_prog_ac_ct_CC`])
|
||||
AC_MSG_RESULT(CC=$ac_cv_prog_ac_ct_CC)
|
||||
ac_cv_prog_ac_ct_AR=${ac_cv_prog_ac_ct_CC%/*}/ar
|
||||
ac_cv_prog_ac_ct_LD=${ac_cv_prog_ac_ct_CC%/*}/ld
|
||||
ac_cv_prog_ac_ct_NM=${ac_cv_prog_ac_ct_CC%/*}/nm
|
||||
# For Apple clang version 14.0.3 (clang-1403.0.22.14.1)
|
||||
ac_cv_prog_ac_ct_AR=`$CC -print-prog-name=ar`
|
||||
ac_cv_prog_ac_ct_LD=`$CC -print-prog-name=ld`
|
||||
ac_cv_prog_ac_ct_NM=`$CC -print-prog-name=nm`
|
||||
])
|
||||
AS_CASE(["${target_os}"],
|
||||
[cygwin*|msys*|mingw*|darwin*], [
|
||||
|
|
Загрузка…
Ссылка в новой задаче