diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2023-03-06 22:14:33 -0800 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2023-03-06 22:14:44 -0800 |
| commit | f68580890faef54a8000e3d9b79341dbd17c115e (patch) | |
| tree | 5e5ede12b239c4cfea570913e08d0f1ba997bca9 | |
| parent | 50a709fb9e07f523c8a0649d3039161b77f300ad (diff) | |
| download | ruby-f68580890faef54a8000e3d9b79341dbd17c115e.tar.gz | |
Stop building mjit_build_dir.so
| -rw-r--r-- | ruby-runner.c | 10 | ||||
| -rw-r--r-- | template/Makefile.in | 10 | ||||
| -rw-r--r-- | test/lib/jit_support.rb | 5 |
3 files changed, 0 insertions, 25 deletions
diff --git a/ruby-runner.c b/ruby-runner.c index d7ce511a85..bbc2b78fa0 100644 --- a/ruby-runner.c +++ b/ruby-runner.c @@ -57,10 +57,6 @@ main(int argc, char **argv) PATH_SEPARATOR EXTOUT_DIR"/"ARCH ; -#ifndef LOAD_RELATIVE - static const char mjit_build_dir[] = BUILDDIR"/mjit_build_dir."SOEXT; - struct stat stbuf; -#endif const size_t dirsize = sizeof(builddir); const size_t namesize = sizeof(rubypath) - dirsize; const char *rubyname = rubypath + dirsize; @@ -68,12 +64,6 @@ main(int argc, char **argv) insert_env_path(LIBPATHENV, builddir, dirsize, 1); insert_env_path("RUBYLIB", rubylib, sizeof(rubylib), 0); -#ifndef LOAD_RELATIVE - if (PRELOADENV[0] && stat(mjit_build_dir, &stbuf) == 0) { - insert_env_path(PRELOADENV, mjit_build_dir, sizeof(mjit_build_dir), 1); - setenv("MJIT_SEARCH_BUILD_DIR", "true", 0); - } -#endif if (!(p = strrchr(arg0, '/'))) p = arg0; else p++; if (strlen(p) < namesize - 1) { diff --git a/template/Makefile.in b/template/Makefile.in index 0dd30ca7d1..dd3b730139 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -481,9 +481,6 @@ probes.$(OBJEXT): $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp) $(Q) $(RM) $@ $(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS) -clean-local:: - $(Q)$(RM) -r mjit_build_dir.* - # DTrace static library hacks described here: # https://marc.info/?l=opensolaris-dtrace-discuss&m=114761203110734&w=4 ruby-glommed.$(OBJEXT): @@ -666,13 +663,6 @@ mjit_config.h: echo '#endif /* RUBY_MJIT_CONFIG_H */'; \ } > $@ -yes-test-almost yes-test-all programs: mjit_build_dir.$(SOEXT) -mjit_build_dir.$(SOEXT): $(srcdir)/ruby-runner.c ruby-runner.h - $(ECHO) making $@ - $(Q) $(DLDSHARED) $(MJIT_DLDFLAGS) $(ARCH_FLAG) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) \ - -DMAKE_MJIT_BUILD_DIR=1 \ - $(OUTFLAG)$@ $(srcdir)/ruby-runner.c - # yes-test-basic: leaked-globals leaked-globals: $(COMMONOBJS) prog $(tooldir)/leaked-globals PHONY $(Q) $(XRUBY) $(tooldir)/leaked-globals NM="$(NM) -Pgp" SYMBOL_PREFIX=$(SYMBOL_PREFIX) PLATFORM=$(hdrdir)/ruby/$(PLATFORM_DIR).h $(srcdir)/configure.ac $(COMMONOBJS) diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb index 812c13b925..9ff1914133 100644 --- a/test/lib/jit_support.rb +++ b/test/lib/jit_support.rb @@ -48,11 +48,6 @@ module JITSupport args << '--mjit-save-temps' if save_temps args << '--mjit-debug' if defined?(@mjit_debug) && @mjit_debug 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'] and !preloadenv.empty? - so = "mjit_build_dir.#{RbConfig::CONFIG['SOEXT']}" - base_env[preloadenv] = File.realpath(so) rescue nil - end args.unshift(env ? base_env.merge!(env) : base_env) EnvUtil.invoke_ruby(args, '', true, true, timeout: timeout, |