summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-14 03:32:54 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-14 03:32:54 +0000
commit11ef85d237f78d40aba84ae1804449cb738bde58 (patch)
tree2b56dd8042de267f3beb577805ac72a3d0226de2
parenta3730a7eec89c948a72fe0575e60063e3d6e4424 (diff)
ruby.c: load statically linked extensions before rubygems
* 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
-rw-r--r--ChangeLog5
-rw-r--r--ruby.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3626002..7190ef2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
rubygems directly when --enable=gems is given.
diff --git a/ruby.c b/ruby.c
index 233e140..e73fc48 100644
--- a/ruby.c
+++ b/ruby.c
@@ -561,7 +561,6 @@ require_libraries(VALUE *req_list)
int prev_parse_in_eval = th->parse_in_eval;
th->parse_in_eval = 0;
- Init_ext(); /* should be called here for some reason :-( */
CONST_ID(require, "require");
while (list && RARRAY_LEN(list) > 0) {
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));
}
}
+ Init_ext(); /* load statically linked extensions before rubygems */
if (!(opt->disable & DISABLE_BIT(gems))) {
rb_define_module("Gem");
}