summaryrefslogtreecommitdiff
path: root/nacl
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-10 12:51:40 (GMT)
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-10 12:51:40 (GMT)
commitcc4072b3db93fffb03f7a4e9a43bd02b6ae0500b (patch)
tree58f15f168984721d3de721e4716300f627b3b4f7 /nacl
parentc3f3d77225499eba2e2f562024413dd2794c0139 (diff)
* 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
Diffstat (limited to 'nacl')
-rw-r--r--nacl/nacl-config.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/nacl/nacl-config.rb b/nacl/nacl-config.rb
index 94a64aa..b90c9ed 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