diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-06 05:14:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-06 05:14:36 +0000 |
| commit | b11b804f8f4c84c7f5d59dd215e3d8a3d4d9d889 (patch) | |
| tree | f94cc4f18c2dc8b5feb34352ae305248979bdd21 /Makefile.in | |
| parent | a5400ebbd5d8cff97ef20d3798d2dbb4b2302009 (diff) | |
| download | ruby-b11b804f8f4c84c7f5d59dd215e3d8a3d4d9d889.tar.gz | |
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
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 6d2db109f5..913e4df814 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)$@ |