diff options
| author | nagachika <nagachika@ruby-lang.org> | 2023-07-22 13:32:30 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2023-07-22 13:32:30 +0900 |
| commit | 35cf3a5f8d01aad07762eb824c3107bee9ae7fdd (patch) | |
| tree | 79bde2c03e6192e2acfd5b62f874a089a49f23cf | |
| parent | 4e0653db3315e9e7859e38e0995e2b9900471370 (diff) | |
merge revision(s) 038f9ade3c4d965415e4956561975454cf9eeb21: [Backport #19585]
Use tools appropriate with CC
To get rid of mysterious errors such as:
```
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm: error: libruby.3.3-static.a(/): The end of the file was unexpectedly encountered
```
and
```
ld: warning: ignoring file ../../libruby.3.3-static.a, building for macOS-x86_64 but attempting to link with file built for macOS-x86_64
Undefined symbols for architecture x86_64:
"_rb_rational_num", referenced from:
```
---
configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 151a0da970..1008811823 100644 --- a/configure.ac +++ b/configure.ac @@ -233,6 +233,12 @@ AS_CASE(["${build_os}"], ], [aix*], [ AC_PATH_TOOL([NM], [nm], [/usr/ccs/bin/nm], [/usr/ccs/bin:$PATH]) +], +[darwin*], [ + # 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*], [ @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 2 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 100 +#define RUBY_PATCHLEVEL 101 #include "ruby/version.h" #include "ruby/internal/abi.h" |