summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-03 07:25:55 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-03 07:25:55 +0000
commite07bdafbf4c3ef5e96ab026490302a2dd090572e (patch)
treea9ddd200b2037d05637505c3428b20ea7f826e3b
parent77ef86feaa7218500435c0851701e8a4688fa82a (diff)
Revert "* configure.in: move RUBY_MINGW32 after AC_PROG_CC."
This reverts commit r36603. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
2 files changed, 1 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b44d38a5ae..a2acb1cb42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Fri Aug 3 15:15:04 2012 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: move RUBY_MINGW32 after AC_PROG_CC.
- RUBY_MINGW32 uses AC_TRY_CPP and it sets CC and CPP. [Bug #6816]
-
Thu Aug 2 20:32:29 2012 Shugo Maeda <shugo@ruby-lang.org>
* eval.c (rb_mod_using): new method Module#using. [experimental]
diff --git a/configure.in b/configure.in
index 0ebb7cbdbd..fad36e09d9 100644
--- a/configure.in
+++ b/configure.in
@@ -372,11 +372,11 @@ RUBY_NACL
if test x"${build}" != x"${host}"; then
AC_CHECK_TOOL(CC, gcc)
fi
+RUBY_MINGW32
AS_CASE(["$build_os"],
[darwin*], [ AC_PROG_CC(clang gcc cc) ],
[ AC_PROG_CC ])
AC_PROG_CXX
-RUBY_MINGW32
AC_PROG_GCC_TRADITIONAL
AC_SUBST(GCC)
AC_CHECK_TOOL([LD], [ld], [ld])