nobu	2011-11-08 17:30:53 +0900 (Tue, 08 Nov 2011)

  New Revision: 33669

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

  Log:
    * lib/mkmf.rb (cpp_command): remove multiple -arch flags since cpp
      cannot work.

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33668)
+++ ChangeLog	(revision 33669)
@@ -1,3 +1,8 @@
+Tue Nov  8 17:30:50 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (cpp_command): remove multiple -arch flags since cpp
+	  cannot work.
+
 Tue Nov  8 14:50:55 2011  NAKAMURA Usaku  <usa@r...>
 
 	* io.c (io_fwrite): call rb_w32_write_console() only if FMODE_TTY is
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 33668)
+++ lib/mkmf.rb	(revision 33669)
@@ -418,6 +418,9 @@
   conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
                                 'arch_hdrdir' => $arch_hdrdir.quote,
                                 'top_srcdir' => $top_srcdir.quote)
+  if $universal and (arch_flag = conf['ARCH_FLAG']) and !arch_flag.empty?
+    conf['ARCH_FLAG'] = arch_flag.gsub(/(?:\G|\s)-arch\s+\S+/, '')
+  end
   RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
                    conf)
 end

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