1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in: Fix the timing to detect the appropriate C++ compiler in OS X

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mrkn 2016-06-05 13:09:43 +00:00
parent e478bb7d79
commit 3cb77c4b03
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 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 * ext/openssl/extconf.rb: Check absence of CRYPTO_lock() to see if the

23
configure.in
View File

@ -259,17 +259,7 @@ then
AC_MSG_ERROR(cached CC is different -- throw away $cache_file AC_MSG_ERROR(cached CC is different -- throw away $cache_file
(it is also a good idea to do 'make clean' before compiling)) (it is also a good idea to do 'make clean' before compiling))
fi 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 "$CC" || ac_cv_prog_CC="$CC"
test -z "$CXX" || ac_cv_prog_CXX="$CXX"
if test "$program_prefix" = NONE; then if test "$program_prefix" = NONE; then
program_prefix= program_prefix=
@ -496,6 +486,19 @@ if test x"${build}" != x"${host}"; then
fi fi
AC_PROG_CC 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 AC_PROG_CXX
RUBY_MINGW32 RUBY_MINGW32
AC_PROG_GCC_TRADITIONAL AC_PROG_GCC_TRADITIONAL