ruby-changes:21510
From: knu <ko1@a...>
Date: Sun, 30 Oct 2011 00:49:51 +0900 (JST)
Subject: [ruby-changes:21510] knu:r33559 (ruby_1_8): * configure.in (CXX): Set CXX when mkconfig.rb wants it defined.
knu 2011-10-30 00:49:38 +0900 (Sun, 30 Oct 2011) New Revision: 33559 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33559 Log: * configure.in (CXX): Set CXX when mkconfig.rb wants it defined. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/configure.in Index: ruby_1_8/configure.in =================================================================== --- ruby_1_8/configure.in (revision 33558) +++ ruby_1_8/configure.in (revision 33559) @@ -69,6 +69,14 @@ 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"], + [darwin11.*], [ + 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++}], + [xclang|x/usr/bin/clang], [: ${CXX=clang++}]) + ]) test -z "$CC" || ac_cv_prog_CC="$CC" if test "$program_prefix" = NONE; then @@ -176,6 +184,7 @@ AC_CHECK_TOOL(CC, gcc) fi AC_PROG_CC +AC_PROG_CXX AC_PROG_GCC_TRADITIONAL test $ac_cv_prog_cc_g = yes && : ${debugflags=-g} if test "$GCC" = yes; then Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 33558) +++ ruby_1_8/ChangeLog (revision 33559) @@ -1,3 +1,7 @@ +Sun Oct 30 00:48:57 2011 Akinori MUSHA <knu@i...> + + * configure.in (CXX): Set CXX when mkconfig.rb wants it defined. + Wed Oct 26 16:05:39 2011 Nobuyoshi Nakada <nobu@r...> * string.c (rb_str_partition, rb_str_rpartition) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/