summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-24 10:39:49 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-24 10:39:49 +0000
commitbbc1f25cefbbde5ca6c47fc0817cc4c94c09b8e8 (patch)
treed5bc723cc16aae6250b2260a9a8bad51e2fd3d9e
parent3ee460750c501d91710da94ec483cb2318aa906a (diff)
merges r28730 from trunk into ruby_1_9_2.
-- * configure.in (RUBY_MINGW32): ignore msvc suffix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6fa83202a1..de8352bcf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 23 15:09:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RUBY_MINGW32): ignore msvc suffix.
+
Fri Jul 23 09:02:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (rb_reg_expr_str): fixed out-of-boundary access at invalid
diff --git a/configure.in b/configure.in
index 4e3fca9543..da56327259 100644
--- a/configure.in
+++ b/configure.in
@@ -34,6 +34,9 @@ AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
], rb_cv_mingw32=yes,rb_cv_mingw32=no)
rm -f conftest*])
test "$rb_cv_mingw32" = yes && target_os="mingw32"
+ ])
+AS_CASE(["$target_os"], [mingw*msvc], [
+target_os="`echo ${target_os} | sed 's/msvc$//'`"
])])
AC_DEFUN([RUBY_CPPOUTFILE],