diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,12 @@ +Tue Apr 16 01:30:47 2013 Kenta Murata <mrkn@mrkn.jp> + + * configure.in: set ac_cv_prog_cxx if CXX is supplied. + +Tue Apr 16 01:30:47 2013 Kenta Murata <mrkn@mrkn.jp> + + * configure.in: Fix c++ compiler auto-selection not only for + Darwin 11.x, but also the other versions of Darwin. + Tue Apr 16 00:27:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * compile.c (iseq_compile_each): fix of defined? with empty diff --git a/configure.in b/configure.in index b7682cfa8e..7cdbb1e3e5 100644 --- a/configure.in +++ b/configure.in @@ -190,7 +190,7 @@ then (it is also a good idea to do 'make clean' before compiling)) fi AS_CASE(["$build_os"], - [darwin11.*], [ + [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++}], @@ -198,6 +198,7 @@ AS_CASE(["$build_os"], [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= @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-04-16" -#define RUBY_PATCHLEVEL 139 +#define RUBY_PATCHLEVEL 140 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4 |