diff options
| author | mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-05 13:09:43 +0000 |
|---|---|---|
| committer | mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-05 13:09:43 +0000 |
| commit | eebee71287191ead1f90d8e27a9499a361618ebf (patch) | |
| tree | 10c850aade9a0c1aadfb234c215994889822a166 | |
| parent | b29375412dd48a4bd9f71c50d907ae6c6b9fad35 (diff) | |
| download | ruby-eebee71287191ead1f90d8e27a9499a361618ebf.tar.gz | |
configure.in: Fix the timing to detect the appropriate C++ compiler in OS X
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 23 |
2 files changed, 18 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Sun Jun 5 22:06:00 2016 Kenta Murata <mrkn@mrkn.jp> + + * configure.in: Fix the timing to detect the appropriate C++ compiler + in OS X. + Sun Jun 5 21:42:24 2016 Kazuki Yamaguchi <k@rhe.jp> * ext/openssl/extconf.rb: Check absence of CRYPTO_lock() to see if the diff --git a/configure.in b/configure.in index 3884063e04..063d839478 100644 --- a/configure.in +++ b/configure.in @@ -259,17 +259,7 @@ 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"], - [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++}], - [xcc|x/usr/bin/cc], [: ${CXX=c++}], - [xicc], [: ${CXX=icpc}], - [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= @@ -496,6 +486,19 @@ if test x"${build}" != x"${host}"; then fi AC_PROG_CC + +dnl Select the appropriate C++ compiler in OS X +AS_CASE(["$build_os"], + [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++}], + [xcc|x/usr/bin/cc], [: ${CXX=c++}], + [xicc], [: ${CXX=icpc}], + [xclang|x/usr/bin/clang], [: ${CXX=clang++}]) + ]) +test -z "$CXX" || ac_cv_prog_CXX="$CXX" + AC_PROG_CXX RUBY_MINGW32 AC_PROG_GCC_TRADITIONAL |