aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.in7
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index db8da960db..5dbc9002d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Aug 3 17:25:49 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]
+
+ * configure.in: don't use AC_PROG_CC in AS_CASE.
+
Fri Aug 3 17:21:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/runner.rb: get rid of loading previously installed gems.
diff --git a/configure.in b/configure.in
index fad36e09d9..8e20ced700 100644
--- a/configure.in
+++ b/configure.in
@@ -372,11 +372,12 @@ 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 ])
+[darwin*], [ cc_list="clang gcc cc" ],
+ [ cc_list="gcc cc" ])
+AC_PROG_CC([$cc_list])
AC_PROG_CXX
+RUBY_MINGW32
AC_PROG_GCC_TRADITIONAL
AC_SUBST(GCC)
AC_CHECK_TOOL([LD], [ld], [ld])