nobu	2009-10-23 14:25:56 +0900 (Fri, 23 Oct 2009)

  New Revision: 25443

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

  Log:
    * configure.in (target, target_alias): replace with real cpu.
    
    * mkconfig.rb: build* are not needed in rbconfig.rb.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/mkconfig.rb
    trunk/ChangeLog
    trunk/configure.in
    trunk/tool/mkconfig.rb

Index: configure.in
===================================================================
--- configure.in	(revision 25442)
+++ configure.in	(revision 25443)
@@ -189,18 +189,18 @@
     esac
     AC_MSG_RESULT([$target_archs])
 
+    target=`echo $target | sed "s/^$target_cpu-/-/"`
+    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
     if test "${universal_binary-no}" = yes; then
 	RUBY_PREREQ_AC(2.63, [ to compile universal binary])
 	AC_SUBST(try_header,try_compile)
-	target=`echo $target | sed "s/^$target_cpu-/universal-/"`
-	target_alias=`echo $target_alias | sed "s/^$target_cpu-/universal-/"`
 	target_cpu=universal
 	real_cross_compiling=$cross_compiling
     else
-	target=`echo $target | sed "s/^$target_cpu-/${target_archs}-/"`
-	target_alias=`echo $target_alias | sed "s/^$target_cpu-/${target_archs}-/"`
 	target_cpu=${target_archs}
     fi
+    case "$target" in when(-*) target="$target_cpu${target}";; esac
+    case "$target_alias" in when(-*) target_alias="$target_cpu${target_alias}";; esac
     CFLAGS="$CFLAGS ${ARCH_FLAG}"
     LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
 else
@@ -208,6 +208,7 @@
 	case "$target_os" in
 	  when(darwin*)
 	    AC_MSG_CHECKING([for real target cpu])
+	    target=`echo $target | sed "s/^$target_cpu-/-/"`
 	    target_cpu=`$CC -E - 2>/dev/null <<EOF |
 #ifdef __x86_64__
 "processor-name=x86_64"
@@ -223,6 +224,7 @@
 #endif
 EOF
 	    sed -n 's/^"processor-name=\(.*\)"/\1/p'`
+	    target="$target_cpu${target}"
 	    AC_MSG_RESULT([$target_cpu])
 	    ;;
 	esac
@@ -311,7 +313,11 @@
     AC_CHECK_TOOL(NM, nm)
     AC_CHECK_TOOL(WINDRES, windres)
     AC_CHECK_TOOL(DLLWRAP, dllwrap)
+    target=`echo $target | sed "s/^$target_cpu-/-/"`
+    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
     target_cpu=`echo $target_cpu | sed s/i.86/i386/`
+    case "$target" in when(-*) target="$target_cpu${target}";; esac
+    case "$target_alias" in when(-*) target_alias="$target_cpu${target_alias}";; esac
     case "$target_os" in
     when(mingw*)
 	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25442)
+++ ChangeLog	(revision 25443)
@@ -1,5 +1,9 @@
-Fri Oct 23 14:22:51 2009  Nobuyoshi Nakada  <nobu@r...>
+Fri Oct 23 14:25:54 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* configure.in (target, target_alias): replace with real cpu.
+
+	* mkconfig.rb: build* are not needed in rbconfig.rb.
+
 	* configure.in (warnflags): use -Wextra only when
 	  -Wno-missing-field-initializers is available.
 
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 25442)
+++ tool/mkconfig.rb	(revision 25443)
@@ -77,6 +77,7 @@
     when /^RUBY_SO_NAME$/; next if $so_name
     when /^arch$/; if val.empty? then val = arch else arch = val end
     when /^sitearch/; val = '$(arch)' if val.empty?
+    when /^build/; next
     end
     case val
     when /^\$\(ac_\w+\)$/; next
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 25442)
+++ ruby_1_8/configure.in	(revision 25443)
@@ -200,7 +200,11 @@
     AC_CHECK_TOOL(NM, nm)
     AC_CHECK_TOOL(WINDRES, windres)
     AC_CHECK_TOOL(DLLWRAP, dllwrap)
+    target=`echo $target | sed "s/^$target_cpu-/-/"`
+    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
     target_cpu=`echo $target_cpu | sed s/i.86/i386/`
+    case "$target" in when(-*) target="$target_cpu${target}";; esac
+    case "$target_alias" in when(-*) target_alias="$target_cpu${target_alias}";; esac
     case "$target_os" in
     mingw*)
 	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 25442)
+++ ruby_1_8/ChangeLog	(revision 25443)
@@ -1,3 +1,9 @@
+Fri Oct 23 14:25:54 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (target, target_alias): replace with real cpu.
+
+	* mkconfig.rb: build* are not needed in rbconfig.rb.
+
 Thu Oct 22 17:57:53 2009  Akinori MUSHA  <knu@i...>
 
 	* lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not
Index: ruby_1_8/mkconfig.rb
===================================================================
--- ruby_1_8/mkconfig.rb	(revision 25442)
+++ ruby_1_8/mkconfig.rb	(revision 25443)
@@ -76,6 +76,7 @@
     next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name
     next if $so_name and /^RUBY_SO_NAME$/ =~  name
     next if /^(?:X|(?:MINI|RUN)RUBY$)/ =~ name
+    next if /^build/ =~ name
     if /^program_transform_name$/ =~ name and /^s(\\?.)(.*)\1$/ =~ val
       next if $install_name
       sep = %r"#{Regexp.quote($1)}"

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