From e3dbba340e20927a3c3497ba2f786dbd9dfa3f15 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 15 Apr 2013 16:33:31 +0000 Subject: merge revision(s) 39814,39815: [Backport #8117] * configure.in: Fix c++ compiler auto-selection not only for Darwin 11.x, but also the other versions of Darwin. * configure.in: set ac_cv_prog_cxx if CXX is supplied. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ configure.in | 3 ++- version.h | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89cb83e5e4..6407a773a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Apr 16 01:30:47 2013 Kenta Murata + + * configure.in: set ac_cv_prog_cxx if CXX is supplied. + +Tue Apr 16 01:30:47 2013 Kenta Murata + + * 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 * 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= diff --git a/version.h b/version.h index ba212e387d..f5fb7dc75a 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3