diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-30 04:45:00 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-30 04:45:00 +0000 |
commit | c1e6116aee2cfc0a6c11c41cf8b0c82601ee7dbe (patch) | |
tree | 9adc63f40358fe50c4f98b4fc12fb0782fa6cd2b | |
parent | b3498ae62d25047d62c6d58906a2512bfd2d8ddc (diff) |
merges r31365 from trunk into ruby_1_9_2.
--
* configure.in (STRIP): use proper toolchain. based on a patch
from Jon Forums at [ruby-core:35909]. fixes #4617
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 7 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Apr 27 07:42:44 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (STRIP): use proper toolchain. based on a patch + from Jon Forums at [ruby-core:35909]. fixes #4617 + Wed Apr 27 00:51:01 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_file_truncate): fix function. diff --git a/configure.in b/configure.in index adcfddac96..8e481b748d 100644 --- a/configure.in +++ b/configure.in @@ -2009,18 +2009,17 @@ test ".$DLEXT" = "." || AC_DEFINE_UNQUOTED(DLEXT, ".$DLEXT") test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2") AC_SUBST(DLEXT) -AC_SUBST(STRIP)dnl if test "$with_dln_a_out" = yes; then STRIP=true else - STRIP=strip + AC_CHECK_TOOL(STRIP, strip, :)dnl fi AS_CASE(["$target_os"], [linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu], [ - STRIP='strip -S -x'], + STRIP="$STRIP -S -x"], [nextstep* | openstep* | rhapsody* | darwin*], [ - STRIP='strip -A -n']) + STRIP="$STRIP -A -n"]) AC_ARG_WITH(ext, AC_HELP_STRING([--with-ext=EXTS], @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 243 +#define RUBY_PATCHLEVEL 244 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |