summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-17 08:01:48 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-17 08:01:48 +0000
commitdc13c010da097e85dad8a7b5e4e2fe5c2e935f64 (patch)
treeade705e2b5c514075140d51fd887ac079ea37169
parent268b6ddd363db2d0c59caf82b5cc8696f4ff21c6 (diff)
Backport r31365; fixes #4661.
* 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_8@32570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in20
2 files changed, 11 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index fb0dd0a049..02df76fd12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 17 16:55:34 2011 Akinori MUSHA <[email protected]>
+
+ * configure.in (STRIP): use proper toolchain. based on a patch
+ from Jon Forums at [ruby-core:35909]. fixes #4617
+
Thu Jul 14 16:53:01 2011 Nobuyoshi Nakada <[email protected]>
* eval.c (ruby_setjmp): need to save the stack after r2 (the Table
diff --git a/configure.in b/configure.in
index 4ff0cda630..edc50f913e 100644
--- a/configure.in
+++ b/configure.in
@@ -1469,25 +1469,17 @@ AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
test ".$DLEXT" = "." || AC_DEFINE_UNQUOTED(DLEXT, ".$DLEXT")
test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2")
-AC_SUBST(STRIP)dnl
if test "$with_dln_a_out" = yes; then
STRIP=true
else
- STRIP=strip
+ AC_CHECK_TOOL(STRIP, strip, :)dnl
fi
-case "$target_os" in
- linux* | gnu* | k*bsd*-gnu)
- STRIP='strip -S -x';;
- nextstep*)
- STRIP='strip -A -n';;
- openstep*)
- STRIP='strip -A -n';;
- rhapsody*)
- STRIP='strip -A -n';;
- darwin*)
- STRIP='strip -A -n';;
-esac
+AS_CASE(["$target_os"],
+ [linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu], [
+ STRIP="$STRIP -S -x"],
+ [nextstep* | openstep* | rhapsody* | darwin*], [
+ STRIP="$STRIP -A -n"])
EXTSTATIC=
AC_SUBST(EXTSTATIC)dnl