kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2012-06-10 12:51:40 +00:00
parent c3f3d77225
commit cc4072b3db
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> Sun Jun 10 20:23:14 2012 Yuki Sonoda (Yugui) <yugui@yugui.jp>
Fixes threading on NativeClient. Fixes threading on NativeClient.

10
nacl/nacl-config.rb
View file

@ -10,8 +10,8 @@ require 'rbconfig'
module NaClConfig module NaClConfig
config = RbConfig::CONFIG config = RbConfig::CONFIG
cpu_nick = config['host_alias'].sub(/-gnu$|-newlib$/, '').sub(/-nacl$/, '') cpu_nick = config['host_alias'].sub(/-gnu$|-newlib$/, '').sub(/-nacl$/, '').sub(/i.86/, 'x86_32')
ARCH = cpu_nick.sub('x86_64', 'x86-64').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' HOST = ARCH.sub(/x86-../, 'x86_64') + '-nacl'
lib_suffix = config['host_cpu'][/i.86/] ? '32' : '' lib_suffix = config['host_cpu'][/i.86/] ? '32' : ''
@ -21,7 +21,7 @@ module NaClConfig
CREATE_NMF = [ CREATE_NMF = [
File.join(SDK_ROOT, 'build_tools', 'nacl_sdk_scons', 'site_tools', 'create_nmf.py'), File.join(SDK_ROOT, 'build_tools', 'nacl_sdk_scons', 'site_tools', 'create_nmf.py'),
File.join(SDK_ROOT, '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}") HOST_LIB = File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], HOST, "lib#{lib_suffix}")
INSTALL_PROGRAM = config['INSTALL_PROGRAM'] INSTALL_PROGRAM = config['INSTALL_PROGRAM']
@ -30,11 +30,11 @@ module NaClConfig
SEL_LDR = [ SEL_LDR = [
File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], 'bin', "sel_ldr_#{cpu_nick}"), File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], 'bin', "sel_ldr_#{cpu_nick}"),
File.join(SDK_ROOT, 'tools', "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 = [ IRT_CORE = [
File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], 'bin', "irt_core_#{cpu_nick}.nexe"), File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], 'bin', "irt_core_#{cpu_nick}.nexe"),
File.join(SDK_ROOT, 'tools', "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') RUNNABLE_LD = File.join(HOST_LIB, 'runnable-ld.so')
module_function module_function