mrkn	2016-06-05 22:09:43 +0900 (Sun, 05 Jun 2016)

  New Revision: 55284

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55284

  Log:
    configure.in: Fix the timing to detect the appropriate C++ compiler in OS X

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 55283)
+++ configure.in	(revision 55284)
@@ -259,17 +259,7 @@ then https://github.com/ruby/ruby/blob/trunk/configure.in#L259
   AC_MSG_ERROR(cached CC is different -- throw away $cache_file
 (it is also a good idea to do 'make clean' before compiling))
 fi
-AS_CASE(["$build_os"],
-  [darwin1*.*], [
-    AS_CASE(["x$CC"],
-      [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}],
-      [xgcc|x/usr/bin/gcc],         [: ${CXX=g++}],
-      [xcc|x/usr/bin/cc],           [: ${CXX=c++}],
-      [xicc],                       [: ${CXX=icpc}],
-      [xclang|x/usr/bin/clang],     [: ${CXX=clang++}])
-  ])
 test -z "$CC" || ac_cv_prog_CC="$CC"
-test -z "$CXX" || ac_cv_prog_CXX="$CXX"
 
 if test "$program_prefix" = NONE; then
   program_prefix=
@@ -496,6 +486,19 @@ if test x"${build}" != x"${host}"; then https://github.com/ruby/ruby/blob/trunk/configure.in#L486
 fi
 
 AC_PROG_CC
+
+dnl Select the appropriate C++ compiler in OS X
+AS_CASE(["$build_os"],
+  [darwin1*.*], [
+    AS_CASE(["x$CC"],
+      [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}],
+      [xgcc|x/usr/bin/gcc],         [: ${CXX=g++}],
+      [xcc|x/usr/bin/cc],           [: ${CXX=c++}],
+      [xicc],                       [: ${CXX=icpc}],
+      [xclang|x/usr/bin/clang],     [: ${CXX=clang++}])
+  ])
+test -z "$CXX" || ac_cv_prog_CXX="$CXX"
+
 AC_PROG_CXX
 RUBY_MINGW32
 AC_PROG_GCC_TRADITIONAL
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55283)
+++ ChangeLog	(revision 55284)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Jun  5 22:06:00 2016  Kenta Murata  <mrkn@m...>
+
+	* configure.in: Fix the timing to detect the appropriate C++ compiler
+	  in OS X.
+
 Sun Jun  5 21:42:24 2016  Kazuki Yamaguchi  <k@r...>
 
 	* ext/openssl/extconf.rb: Check absence of CRYPTO_lock() to see if the

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/