yugui	2012-06-10 21:51:40 +0900 (Sun, 10 Jun 2012)

  New Revision: 36023

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

  Log:
    * nacl/nacl_config.rb: Fixed for 32bit hosts.

  Modified files:
    trunk/ChangeLog
    trunk/nacl/nacl-config.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36022)
+++ ChangeLog	(revision 36023)
@@ -1,3 +1,7 @@
+Sun Jun 10 21:50:45 2012  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* nacl/nacl_config.rb: Fixed for 32bit hosts.
+
 Sun Jun 10 20:23:14 2012  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	Fixes threading on NativeClient.
Index: nacl/nacl-config.rb
===================================================================
--- nacl/nacl-config.rb	(revision 36022)
+++ nacl/nacl-config.rb	(revision 36023)
@@ -10,8 +10,8 @@
 module NaClConfig
   config = RbConfig::CONFIG
 
-  cpu_nick = config['host_alias'].sub(/-gnu$|-newlib$/, '').sub(/-nacl$/, '')
-  ARCH = cpu_nick.sub('x86_64', 'x86-64').sub(/i.86/, 'x86-32')
+  cpu_nick = config['host_alias'].sub(/-gnu$|-newlib$/, '').sub(/-nacl$/, '').sub(/i.86/, 'x86_32')
+  ARCH = cpu_nick.sub('x86_64', 'x86-64').sub('x86_32', 'x86-32')
   HOST = ARCH.sub(/x86-../, 'x86_64') + '-nacl'
 
   lib_suffix = config['host_cpu'][/i.86/] ? '32' : ''
@@ -21,7 +21,7 @@
   CREATE_NMF = [
     File.join(SDK_ROOT, 'build_tools', 'nacl_sdk_scons', 'site_tools', 'create_nmf.py'),
     File.join(SDK_ROOT, 'tools', 'create_nmf.py')
-  ].find{|path| File.exist?(path) }
+  ].find{|path| File.exist?(path) } or raise "No create_nmf found"
   HOST_LIB = File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], HOST, "lib#{lib_suffix}")
 
   INSTALL_PROGRAM = config['INSTALL_PROGRAM']
@@ -30,11 +30,11 @@
   SEL_LDR = [
     File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], 'bin', "sel_ldr_#{cpu_nick}"),
     File.join(SDK_ROOT, 'tools', "sel_ldr_#{cpu_nick}")
-  ].find{|path| File.executable?(path)}
+  ].find{|path| File.executable?(path)} or raise "No sel_ldr found"
   IRT_CORE = [
     File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], 'bin', "irt_core_#{cpu_nick}.nexe"),
     File.join(SDK_ROOT, 'tools', "irt_core_#{cpu_nick}.nexe")
-  ].find{|path| File.executable?(path)}
+  ].find{|path| File.executable?(path)} or raise "No irt_core found"
   RUNNABLE_LD = File.join(HOST_LIB, 'runnable-ld.so')
 
   module_function

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