diff options
Diffstat (limited to 'mjit.c')
| -rw-r--r-- | mjit.c | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -1184,8 +1184,6 @@ mjit_get_iseq_func(struct rb_iseq_constant_body *body) return body->jit_func; } -/* A name of the header file included in any C file generated by MJIT for iseqs. */ -#define RUBY_MJIT_HEADER_NAME "rb_mjit_min_header-" /* GCC and CLANG executable paths. TODO: The paths should absolute ones to prevent changing C compiler for security reasons. */ #define CC_PATH CC_COMMON_ARGS[0] @@ -1200,9 +1198,8 @@ init_header_filename(void) VALUE basedir_val; char *basedir; size_t baselen; - size_t verlen; - static const char header_name[] = - "/" MJIT_HEADER_INSTALL_DIR "/" RUBY_MJIT_HEADER_NAME; + /* A name of the header file included in any C file generated by MJIT for iseqs. */ + static const char header_name[] = MJIT_MIN_HEADER_NAME; const size_t header_name_len = sizeof(header_name) - 1; char *p; #ifdef _WIN32 @@ -1219,13 +1216,10 @@ init_header_filename(void) basedir_val = ruby_prefix_path; basedir = StringValuePtr(basedir_val); baselen = RSTRING_LEN(basedir_val); - verlen = strlen(ruby_version); - header_file = xmalloc(baselen + header_name_len + verlen + rb_strlen_lit(".h") + 1); + header_file = xmalloc(baselen + header_name_len + 1); p = append_str2(header_file, basedir, baselen); - p = append_str2(p, header_name, header_name_len); - p = append_str2(p, ruby_version, verlen); - p = append_str2(p, ".h", rb_strlen_lit(".h") + 1); + p = append_str2(p, header_name, header_name_len + 1); if ((fd = rb_cloexec_open(header_file, O_RDONLY, 0)) < 0) { verbose(2, "Cannot access header file %s\n", header_file); xfree(header_file); |