diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-29 15:49:38 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-29 15:49:38 +0000 |
| commit | b146b4305ddc0bf4ea90f405214f26b534457c8f (patch) | |
| tree | 78e9643e148e078dfe6423f9d593319981627ac2 | |
| parent | d4299c2fbcad70551c792b3d48ce88123994e297 (diff) | |
| download | ruby-b146b4305ddc0bf4ea90f405214f26b534457c8f.tar.gz | |
* configure.in (CXX): Set CXX when mkconfig.rb wants it defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@33559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Sun Oct 30 00:48:57 2011 Akinori MUSHA <knu@iDaemons.org> + + * configure.in (CXX): Set CXX when mkconfig.rb wants it defined. + Wed Oct 26 16:05:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_partition, rb_str_rpartition) diff --git a/configure.in b/configure.in index 66bb851c1f..a7a60cd23e 100644 --- a/configure.in +++ b/configure.in @@ -69,6 +69,14 @@ then 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 @@ if test x"${build}" != x"${host}"; then 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 |