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

ruby.c: load statically linked extensions before rubygems

Browse source 
* ruby.c (process_options): load statically linked extensions before
  rubygems, because of ext/thread.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-10-14 03:32:54 +00:00
parent a3730a7eec
commit 11ef85d237
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Mon Oct 14 12:22:24 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Oct 14 12:32:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (process_options): load statically linked extensions before
rubygems, because of ext/thread.
* ruby.c (process_options): use gem_prelude instead of requiring * ruby.c (process_options): use gem_prelude instead of requiring
rubygems directly when --enable=gems is given. rubygems directly when --enable=gems is given.

2
ruby.c
View file

@ -561,7 +561,6 @@ require_libraries(VALUE *req_list)
int prev_parse_in_eval = th->parse_in_eval; int prev_parse_in_eval = th->parse_in_eval;
th->parse_in_eval = 0; th->parse_in_eval = 0;
Init_ext(); /* should be called here for some reason :-( */
CONST_ID(require, "require"); CONST_ID(require, "require");
while (list && RARRAY_LEN(list) > 0) { while (list && RARRAY_LEN(list) > 0) {
VALUE feature = rb_ary_shift(list); VALUE feature = rb_ary_shift(list);
@ -1448,6 +1447,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
rb_enc_associate(rb_str_dup(RARRAY_AREF(load_path, i)), lenc)); rb_enc_associate(rb_str_dup(RARRAY_AREF(load_path, i)), lenc));
} }
} }
Init_ext(); /* load statically linked extensions before rubygems */
if (!(opt->disable & DISABLE_BIT(gems))) { if (!(opt->disable & DISABLE_BIT(gems))) {
rb_define_module("Gem"); rb_define_module("Gem");
} }