summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-06 05:14:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-06 05:14:36 +0000
commitb11b804f8f4c84c7f5d59dd215e3d8a3d4d9d889 (patch)
treef94cc4f18c2dc8b5feb34352ae305248979bdd21
parenta5400ebbd5d8cff97ef20d3798d2dbb4b2302009 (diff)
Revert "mjit_build_dir: separate MJIT_BUILD_DIR"
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in9
-rw-r--r--mjit.c12
-rw-r--r--test/lib/jit_support.rb6
3 files changed, 4 insertions, 23 deletions
diff --git a/Makefile.in b/Makefile.in
index 6d2db10..913e4df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -445,7 +445,6 @@ clean-local::
$(Q)$(RM) $(MJIT_MIN_HEADER) $(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX:%=*).h
$(Q)$(RM) $(MJIT_HEADER_INSTALL_DIR)/rb_mjit_min_header-*.h
$(Q)$(RM) $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time mjit_config.h
- $(Q)$(RM) mjit_build_dir.*
-$(Q) $(RMDIRS) $(MJIT_HEADER_INSTALL_DIR) 2> $(NULL) || exit 0
# DTrace static library hacks described here:
@@ -608,6 +607,7 @@ mjit_config.h:
echo '#define RUBY_MJIT_CONFIG_H 1'; \
echo; \
sep=; \
+ quote MJIT_BUILD_DIR "`$(CHDIR) . && pwd`"; \
quote MJIT_MIN_HEADER_NAME "/$(MJIT_HEADER_INSTALL_DIR)/$(MJIT_MIN_HEADER_NAME)"; \
sep=,; \
quote "MJIT_CC_COMMON " "`command -v $(MJIT_CC)`"; \
@@ -630,10 +630,3 @@ mjit_config.h:
echo; \
echo '#endif /* RUBY_MJIT_CONFIG_H */'; \
} > $@
-
-main: mjit_build_dir.$(SOEXT)
-mjit_build_dir.$(SOEXT): $(MJIT_MIN_HEADER)
- $(Q) { \
- echo 'const char MJIT_BUILD_DIR[] = "'"`$(CHDIR) . && pwd`"'";'; \
- } > $(@:.$(SOEXT)=.c)
- $(Q) $(DLDSHARED) $(MJIT_DLDFLAGS) $(ARCH_FLAG) $(CFLAGS) $(CPPFLAGS) $(@:.$(SOEXT)=.c) $(OUTFLAG)$@
diff --git a/mjit.c b/mjit.c
index 4e0dcd3..7844ed9 100644
--- a/mjit.c
+++ b/mjit.c
@@ -381,7 +381,7 @@ init_header_filename(void)
const size_t libpathflag_len = sizeof(libpathflag) - 1;
#endif
#ifndef LOAD_RELATIVE
- const char *build_dir = 0;
+ static const char build_dir[] = MJIT_BUILD_DIR;
struct stat st;
#endif
@@ -394,12 +394,7 @@ init_header_filename(void)
/* This path is not intended to be used on production, but using build directory's
header file here because people want to run `make test-all` without running
`make install`. Don't use $MJIT_SEARCH_BUILD_DIR except for test-all. */
-
- build_dir = dlsym(RTLD_DEFAULT, "MJIT_BUILD_DIR");
- if (!build_dir) {
- verbose(1, "No mjit_build_directory");
- }
- else if (build_dir[0] != '/') {
+ if (build_dir[0] != '/') {
verbose(1, "Non-absolute path MJIT_BUILD_DIR: %s", build_dir);
}
else if (stat(build_dir, &st) || !S_ISDIR(st.st_mode)) {
@@ -410,9 +405,8 @@ init_header_filename(void)
return FALSE;
}
else {
- verbose(3, "MJIT_BUILD_DIR: %s", build_dir);
basedir = build_dir;
- baselen = strlen(build_dir);
+ baselen = sizeof(build_dir) - 1;
}
}
#endif
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb
index 91e3cf8..fa1402e 100644
--- a/test/lib/jit_support.rb
+++ b/test/lib/jit_support.rb
@@ -30,12 +30,6 @@ module JITSupport
args << '--jit-save-temps' if save_temps
args << '-e' << script
base_env = { 'MJIT_SEARCH_BUILD_DIR' => 'true' } # workaround to skip requiring `make install` for `make test-all`
- if preloadenv = RbConfig::CONFIG['PRELOADENV']
- so = "mjit_build_dir.#{RbConfig::CONFIG['SOEXT']}"
- if File.exist?(so)
- base_env[preloadenv] = so
- end
- end
args.unshift(env ? base_env.merge!(env) : base_env)
EnvUtil.invoke_ruby(args,
'', true, true, timeout: timeout,