diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-20 02:37:28 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-20 02:37:28 +0000 |
| commit | fe5d65f1579aed0aac09329b185b25b61c13cd51 (patch) | |
| tree | 2af14b97e09037e3e412913b53616bdd4fce6f85 /win32/Makefile.sub | |
| parent | 2124cb65b37d868f1e7563d8d52344e8bd041799 (diff) | |
| download | ruby-fe5d65f1579aed0aac09329b185b25b61c13cd51.tar.gz | |
common.mk: moved macros to mjit_config.h
* Makefile.in, common.mk, win32/Makefile.sub: moved MJIT macros to
mjit_config.h from XCFLAGS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 6cfb917acb..0cb1b6ba21 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1010,7 +1010,6 @@ s,@top_srcdir@,$(srcdir),;t t s,@try_header@,try_compile,;t t s,@ruby_pc@,$(ruby_pc),;t t <<KEEP -XCFLAGS = $(XCFLAGS) $(MJIT_CPPFLAGS) miniruby: miniruby$(EXEEXT) @@ -1258,6 +1257,8 @@ mjit_config.h: @echo making <<$@ #ifndef RUBY_MJIT_CONFIG_H #define RUBY_MJIT_CONFIG_H 1 + +#define MJIT_HEADER_INSTALL_DIR "$(MJIT_HEADER_INSTALL_DIR)" <<KEEP @ @(set sep=#define MJIT_CC_COMMON ) & \ @@ -1284,5 +1285,10 @@ mjit_config.h: for %I in ($(DLDFLAGS)) do @(call echo.%%sep%%"%%~I", \& set sep= ) >> $@ @echo /* MJIT_DLDFLAGS */>> $@ @ + @(set sep=#define MJIT_LIBS ) & \ + for %I in ($(LIBRUBYARG_SHARED)) do @(call echo.%%sep%%"%%~I", \& set sep= ) >> $@ + @echo /* MJIT_LIBS */>> $@ + @ + @echo.>> $@ @echo #endif /* RUBY_MJIT_CONFIG_H */>> $@ @$(Q:@=: :) type $@ |