aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in9
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dbc9002d7..bba88853a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 3 19:21:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in: use clang prior to gcc only when self-compiling on
+ darwin. search default compilers on other platforms. [Bug #6816]
+
Fri Aug 3 17:25:49 2012 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in: move RUBY_MINGW32 after AC_PROG_CC.
diff --git a/configure.in b/configure.in
index 8e20ced700..b3731b6e71 100644
--- a/configure.in
+++ b/configure.in
@@ -369,13 +369,14 @@ if test -z "${CXXFLAGS+set}"; then
fi
RUBY_NACL
+AS_CASE(["$host_os:$build_os"],
+[darwin*:darwin*], [
+ AC_CHECK_TOOLS(CC, [clang gcc cc])
+])
if test x"${build}" != x"${host}"; then
AC_CHECK_TOOL(CC, gcc)
fi
-AS_CASE(["$build_os"],
-[darwin*], [ cc_list="clang gcc cc" ],
- [ cc_list="gcc cc" ])
-AC_PROG_CC([$cc_list])
+AC_PROG_CC
AC_PROG_CXX
RUBY_MINGW32
AC_PROG_GCC_TRADITIONAL