diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-02 12:59:11 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-02 12:59:11 +0000 |
commit | 66eeabc4ac619fbe39e3939ba6800692e064f97e (patch) | |
tree | bf58bb17937b53f4d263cdd302e84f8b7d1335f6 | |
parent | 6ea227b9c38956efabc56963d29b2a9ea551bb0d (diff) |
merge revision(s) 59454,59954: [Backport #14118]
configure.in: use libtool
* configure.in: use libtool on macOS to suppress a warning against
debug_counter.o, which has no symbols unless USE_DEBUG_COUNTER
is set to non-zero.
configure.in: use newer libtool only
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | configure.in | 14 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 52618232b0..3976945156 100644 --- a/Makefile.in +++ b/Makefile.in @@ -164,7 +164,7 @@ RMDIRS = @RMDIRS@ RMALL = @RMALL@ NM = @NM@ AR = @AR@ -ARFLAGS = @ARFLAGS@ +ARFLAGS = @ARFLAGS@$(empty) RANLIB = @RANLIB@ AS = @AS@ ASFLAGS = @ASFLAGS@ $(INCFLAGS) diff --git a/configure.in b/configure.in index 4a2243afa1..00955b60f3 100644 --- a/configure.in +++ b/configure.in @@ -569,17 +569,23 @@ AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86*]], [ CFLAGS="$save_CFLAGS" fi]) +AS_CASE(["$target_os"], [darwin*], [ +if libtool 2>&1 | grep no_warning_for_no_symbols > /dev/null; then + ac_cv_prog_ac_ct_RANLIB=: + ac_cv_prog_ac_ct_AR='libtool -static' + rb_cv_arflags='-no_warning_for_no_symbols -o' +fi +]) AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(AR, ar) if test -z "$AR"; then AC_CHECK_PROGS(AR, aal, ar) fi -AC_CACHE_CHECK([for $AR D option], [rb_cv_ar_D_option], [ +AC_CACHE_CHECK([for $AR flags], [rb_cv_arflags], [ AS_IF([$AR rcD conftest.a > /dev/null 2>&1 && rm conftest.a], - [rb_cv_ar_D_option=yes], [rb_cv_ar_D_option=no]) + [rb_cv_arflags=rcD], [rb_cv_arflags=rcu]) ]) -AS_IF([test "$rb_cv_ar_D_option" = yes], [ARFLAGS='rcD '], [ARFLAGS='rcu ']) -AC_SUBST(ARFLAGS) +AC_SUBST(ARFLAGS, ["$rb_cv_arflags "]) AC_CHECK_TOOL(AS, as) ASFLAGS=$ASFLAGS @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.4" #define RUBY_RELEASE_DATE "2018-03-02" -#define RUBY_PATCHLEVEL 241 +#define RUBY_PATCHLEVEL 242 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 |