[前][次][番号順一覧][スレッド一覧]

ruby-changes:21124

From: nobu <ko1@a...>
Date: Sat, 3 Sep 2011 23:55:29 +0900 (JST)
Subject: [ruby-changes:21124] nobu:r33173 (trunk): * configure.in (RUBY_MINGW32): take tool prefix from CC.

nobu	2011-09-03 23:55:20 +0900 (Sat, 03 Sep 2011)

  New Revision: 33173

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33173

  Log:
    * configure.in (RUBY_MINGW32): take tool prefix from CC.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 33172)
+++ configure.in	(revision 33173)
@@ -33,7 +33,10 @@
 #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 @@
 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 @@
 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")
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33172)
+++ ChangeLog	(revision 33173)
@@ -1,3 +1,7 @@
+Sat Sep  3 23:55:17 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_MINGW32): take tool prefix from CC.
+
 Sat Sep  3 23:52:08 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (argf_next_argv): open in default text mode.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]