diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-21 15:23:21 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-21 15:23:21 +0000 |
commit | 165221441c462b8feccefaebc70499765d3f710e (patch) | |
tree | ccdde65e28c5905a2eb35beb25a90f77225cbbe6 /ruby.c | |
parent | c2638a81cf9a3e1d476799261b46da35fc836dc1 (diff) | |
download | ruby-165221441c462b8feccefaebc70499765d3f710e.tar.gz |
Enable nacl_io in pepper-ruby.
* configure.in (XCFLAGS): Add include path for NaCl libraries.
(XLDFLAGS): ditto.
(NACL_LIB_PATH): new stubstitution
* nacl/nacl-config.rb: support NACL_LIB_PATH
* nacl/package.rb: ditto.
* nacl/pepper_main.c: replace old implementations with nacl_io.
* nacl/GNUmakefile.in: link nacl_io to pepper_ruby
* ruby.c (rb_load_file): remove __attribute__((weak)) because the old
override hack was replaced with nacl_io.
* file.c (rb_file_load_ok): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1729,9 +1729,6 @@ load_file(VALUE parser, VALUE fname, int script, struct cmdline_options *opt) return (NODE *)rb_ensure(load_file_internal, (VALUE)&arg, restore_lineno, rb_gv_get("$.")); } -#ifdef __native_client__ -__attribute__((weak)) -#endif void * rb_load_file(const char *fname) { |