зеркало из https://github.com/github/ruby.git
* configure.in (RUBY_MINGW32): take tool prefix from CC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
4ac511266d
Коммит
90a10297d6
|
@ -1,3 +1,7 @@
|
|||
Sat Sep 3 23:55:17 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (RUBY_MINGW32): take tool prefix from CC.
|
||||
|
||||
Sat Sep 3 23:52:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* io.c (argf_next_argv): open in default text mode.
|
||||
|
|
|
@ -33,7 +33,10 @@ AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
|
|||
#endif
|
||||
], rb_cv_mingw32=yes,rb_cv_mingw32=no)
|
||||
rm -f conftest*])
|
||||
test "$rb_cv_mingw32" = yes && target_os="mingw32"
|
||||
if test "$rb_cv_mingw32" = yes; then
|
||||
target_os="mingw32"
|
||||
: ${ac_tool_prefix:="`expr "$CC" : ['\(.*-\)g\?cc[^/]*$']`"}
|
||||
fi
|
||||
])
|
||||
AS_CASE(["$target_os"], [mingw*msvc], [
|
||||
target_os="`echo ${target_os} | sed 's/msvc$//'`"
|
||||
|
@ -280,6 +283,7 @@ fi
|
|||
if test x"${build}" != x"${host}"; then
|
||||
AC_CHECK_TOOL(CC, gcc)
|
||||
fi
|
||||
RUBY_MINGW32
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AC_PROG_GCC_TRADITIONAL
|
||||
|
@ -302,7 +306,6 @@ RUBY_CPPOUTFILE
|
|||
AC_SUBST(OUTFLAG)
|
||||
AC_SUBST(COUTFLAG)
|
||||
|
||||
RUBY_MINGW32
|
||||
RUBY_UNIVERSAL_ARCH
|
||||
if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no; then
|
||||
RUBY_DEFAULT_ARCH("$target_cpu")
|
||||
|
|
Загрузка…
Ссылка в новой задаче