2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a2acb1cb42..b44d38a5ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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 fad36e09d9..0ebb7cbdbd 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])