diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-15 16:33:31 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-15 16:33:31 +0000 |
| commit | e3dbba340e20927a3c3497ba2f786dbd9dfa3f15 (patch) | |
| tree | 8fda98193269333d2f3e73934ca2b3ca41668473 /configure.in | |
| parent | 36eb3366780a42736905a66c44fb3f21484591a8 (diff) | |
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
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 3 |
1 files changed, 2 insertions, 1 deletions
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= |