[macruby-changes] [3273] MacRuby/trunk/rakelib/builder.rb

[source_changes at macosforge.org]

Revision: 3273
          http://trac.macosforge.org/projects/ruby/changeset/3273
Author:   pthomson at apple.com
Date:     2010-01-14 10:41:06 -0800 (Thu, 14 Jan 2010)
Log Message:
-----------
Fixed a problem with precompiling extensions on 32-bit architectures.

Modified Paths:
--------------
    MacRuby/trunk/rakelib/builder.rb

Modified: MacRuby/trunk/rakelib/builder.rb
===================================================================
--- MacRuby/trunk/rakelib/builder.rb	2010-01-14 02:11:36 UTC (rev 3272)
+++ MacRuby/trunk/rakelib/builder.rb	2010-01-14 18:41:06 UTC (rev 3273)
@@ -26,7 +26,15 @@
     $stderr.puts "getting archs from RC_ARCHS!"
     s.strip.split(/\s+/)
   else
-    do_option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') }
+    arch = `arch`.chomp
+    case arch
+    when /ppc/
+      do_option('archs', 'ppc') { |x| x.split(',') }
+    when /i386/
+      do_option('archs', 'i386') { |x| x.split(',') }
+    when /x86_64/
+      do_option('archs', ['i386', 'x86_64']) { |x| x.split(',') }
+    end
   end
 LLVM_PATH = do_option('llvm_path', '/usr/local')
 FRAMEWORK_NAME = do_option('framework_name', 'MacRuby')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100114/494ac3f2/attachment.html>