From cc4072b3db93fffb03f7a4e9a43bd02b6ae0500b Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Jun 2012 12:51:40 +0000
Subject: * nacl/nacl_config.rb: Fixed for 32bit hosts.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           |  4 ++++
 nacl/nacl-config.rb | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7160829192..058f831a19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 10 21:50:45 2012  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* nacl/nacl_config.rb: Fixed for 32bit hosts.
+
 Sun Jun 10 20:23:14 2012  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	Fixes threading on NativeClient.
diff --git a/nacl/nacl-config.rb b/nacl/nacl-config.rb
index 94a64aa711..b90c9ed100 100644
--- a/nacl/nacl-config.rb
+++ b/nacl/nacl-config.rb
@@ -10,8 +10,8 @@ require 'rbconfig'
 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 @@ module NaClConfig
   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 @@ module NaClConfig
   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
-- 
cgit v1.2.3