diff options
author | Koichi Sasada <ko1@atdot.net> | 2019-12-10 17:39:04 +0900 |
---|---|---|
committer | Koichi Sasada <ko1@atdot.net> | 2019-12-11 11:24:42 +0900 |
commit | 40026a408df5e3576380f6c1d8bf6c119fa2e32b (patch) | |
tree | 5946811b38d5b70aaa0c5a4ab983fef19478ded9 /mini_builtin.c | |
parent | 9c2807b2df14984e3c81d72a381d9a4d288b3fbe (diff) |
support cross-compilation.
On cross-compilation, compiled binary can no be created because
compiled binary should be created by same interpreter (on cross-
compilation, host ruby is used to build ruby (BASERUBY)).
So that cross-compilation system loads required scripts in text.
It is same as miniruby.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2735
Diffstat (limited to 'mini_builtin.c')
-rw-r--r-- | mini_builtin.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mini_builtin.c b/mini_builtin.c index b86c131ca6..3db640cf01 100644 --- a/mini_builtin.c +++ b/mini_builtin.c @@ -2,11 +2,15 @@ #include "vm_core.h" #include "iseq.h" #include "builtin.h" + #include "miniprelude.c" // included from miniinit.c +#ifndef INCLUDED_BY_BUILTIN_C static struct st_table *loaded_builtin_table; +#endif + rb_ast_t *rb_builtin_ast(const char *feature_name, VALUE *name_str); static const rb_iseq_t * @@ -26,8 +30,10 @@ builtin_iseq_load(const char *feature_name, const struct rb_builtin_function *ta rb_io_write(rb_stdout, rb_iseq_disasm((const rb_iseq_t *)iseq)); } +#ifndef INCLUDED_BY_BUILTIN_C st_insert(loaded_builtin_table, (st_data_t)feature_name, (st_data_t)iseq); rb_gc_register_mark_object((VALUE)iseq); +#endif return iseq; } @@ -39,6 +45,8 @@ rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin rb_iseq_eval(iseq); } +#ifndef INCLUDED_BY_BUILTIN_C + static int each_builtin_i(st_data_t key, st_data_t val, st_data_t dmy) { @@ -70,3 +78,4 @@ Init_builtin_features(void) // register for ruby builtin_iseq_load("gem_prelude", NULL); } +#endif |