diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-08 01:49:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-08 01:49:02 +0000 |
| commit | 2301054a99b85ad2ede6a53404268f25dc2d5fdc (patch) | |
| tree | d0fae32d3f95f2fe8169e01d9b52488d31cf3ead | |
| parent | 3458e8241c2335b5fd268011d4e4f9ba3ffd9e42 (diff) | |
Use BUILDDIR in ruby-runner.h from config.status
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | ruby-runner.c | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 44dcc98456..50bf27f28a 100644 --- a/.gitignore +++ b/.gitignore @@ -95,7 +95,6 @@ lcov*.info /libruby*.* /miniprelude.c /miniruby -/mjit_build_dir.c /newdate.rb /newline.c /newver.rb diff --git a/Makefile.in b/Makefile.in index ac8652ea1d..40a7b5f46f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -613,10 +613,6 @@ mjit_config.h: } > $@ yes-test-almost yes-test-all: mjit_build_dir.$(SOEXT) -mjit_build_dir.$(SOEXT): $(MJIT_MIN_HEADER) +mjit_build_dir.$(SOEXT): $(MJIT_MIN_HEADER) $(srcdir)/ruby-runner.c ruby-runner.h $(ECHO) making $@ - $(Q) { \ - echo 'const char MJIT_BUILD_DIR[] = "'"`$(CHDIR) . && pwd`"'";'; \ - } > $(@:.$(SOEXT)=.c) - $(Q) cat $(@:.$(SOEXT)=.c) - $(Q) $(DLDSHARED) $(MJIT_DLDFLAGS) $(ARCH_FLAG) $(CFLAGS) $(CPPFLAGS) $(@:.$(SOEXT)=.c) $(OUTFLAG)$@ + $(Q) $(DLDSHARED) $(MJIT_DLDFLAGS) $(ARCH_FLAG) $(CFLAGS) $(CPPFLAGS) -DMAKE_MJIT_BUILD_DIR=1 $(OUTFLAG)$@ $(srcdir)/ruby-runner.c @@ -631,7 +631,7 @@ clean-srcs-local:: $(Q)$(RM) parse.c parse.h lex.c enc/trans/newline.c revision.h $(Q)$(RM) id.c id.h probes.dmyh probes.h $(Q)$(RM) encdb.h transdb.h verconf.h ruby-runner.h - $(Q)$(RM) mjit_build_dir.c mjit_config.h rb_mjit_header.h + $(Q)$(RM) mjit_config.h rb_mjit_header.h $(Q)$(RM) $(MJIT_MIN_HEADER) $(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX:%=*).h realclean-srcs-local:: clean-srcs-local diff --git a/ruby-runner.c b/ruby-runner.c index 0ad2561aa4..171f476b45 100644 --- a/ruby-runner.c +++ b/ruby-runner.c @@ -9,6 +9,10 @@ #include "ruby-runner.h" #include "ruby/config.h" +#ifdef MAKE_MJIT_BUILD_DIR +const char MJIT_BUILD_DIR[] = BUILDDIR; +#else + #define STRINGIZE(expr) STRINGIZE0(expr) #define STRINGIZE0(expr) #expr @@ -90,3 +94,5 @@ main(int argc, char **argv) perror(rubypath); return -1; } + +#endif /* MAKE_MJIT_BUILD_DIR */ |