diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-11 02:11:53 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-11 02:11:53 +0000 |
| commit | 69ac654c90178dce12c3365afbc03447a0fccf78 (patch) | |
| tree | 390fb7f7cd6f0888e0c321b8049f0471dd2ca205 /nacl/nacl-config.rb | |
| parent | f21431e574b1b27e47d19ff40ce2997783d310e3 (diff) | |
Merges a patch form naclports.
* configure.in (RUBY_NACL and others): Supports PNaCl.
* dln.c: replace the old hacky dynamic loading over HTTP with nacl_io.
* file.c: tenatively use access(2) instead of eaccess.
(rb_file_load_ok): weaken with attribute but not by postprocess.
* io.c (socket.h): now NaCl has socket.h
(flock): disable here instead of nacl/ioctl.h
* nacl/GNUmakefile.in (CC, LD, NM, AR, AS, RANLIB, OBJDUMP, OBJCOPY):
respect path to them if they are absolute.
This helps naclports to build ruby in their source tree.
(PROGRAM_NMF, .SUFFIXES): support .pnexe for PNaCl.
(ruby.o, file.o): move the hack to attributes in ruby.c and file.c
* nacl/ioctl.h: removed. move the hack to io.c.
* nacl/nacl-config.rb: support arm, pnacl and others.
* nacl/pepper_main.c: support build in a naclports tree.
* ruby.c (rb_load_file): weaken with attribute but not by postprocess.
The patch is by sbc@google.com and the Native Client Authors.
It is available at:
* https://chromium.googlesource.com/external/naclports.git/+/873ca4910a5f9d4206306aacb4ed79c587c6a5f3/ports/ruby/nacl.patch
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'nacl/nacl-config.rb')
| -rwxr-xr-x | nacl/nacl-config.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/nacl/nacl-config.rb b/nacl/nacl-config.rb index 2da05c0847..732de1dee3 100755 --- a/nacl/nacl-config.rb +++ b/nacl/nacl-config.rb @@ -27,14 +27,12 @@ module NaClConfig INSTALL_PROGRAM = config['INSTALL_PROGRAM'] INSTALL_LIBRARY = config['INSTALL_DATA'] - 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)} 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.exist?(path)} or raise "No irt_core found" + if cpu_nick == 'x86_64' or cpu_nick == 'x86_32' + SEL_LDR = File.join(SDK_ROOT, 'tools', "sel_ldr_#{cpu_nick}") + IRT_CORE = File.join(SDK_ROOT, 'tools', "irt_core_#{cpu_nick}.nexe") + raise "No sel_ldr found" if not File.executable?(SEL_LDR) + raise "No irt_core found" if not File.exists?(IRT_CORE) + end RUNNABLE_LD = File.join(HOST_LIB, 'runnable-ld.so') module_function |