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 | 289270c980b364a8378e3476e10b00854d6dcc70 (patch) | |
| tree | 2af14b97e09037e3e412913b53616bdd4fce6f85 /Makefile.in | |
| parent | ca8e2877ff84e26779e21cb9f8b40c0ec5c22c96 (diff) | |
| download | ruby-289270c980b364a8378e3476e10b00854d6dcc70.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 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 2b308f49ee..24ae13bac6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,7 +69,7 @@ optflags = @optflags@ debugflags = @debugflags@ warnflags = @warnflags@ @strict_warnflags@ cppflags = @cppflags@ -XCFLAGS = @XCFLAGS@ $(MJIT_CPPFLAGS) +XCFLAGS = @XCFLAGS@ CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@ MJIT_HEADER_SUFFIX = @@ -553,6 +553,8 @@ mjit_config.h: echo '#ifndef RUBY_MJIT_CONFIG_H'; \ echo '#define RUBY_MJIT_CONFIG_H 1'; \ echo; \ + sep=; \ + quote MJIT_HEADER_INSTALL_DIR "$(MJIT_HEADER_INSTALL_DIR)"; \ sep=,; \ quote "MJIT_CC_COMMON " $(CC); \ quote "MJIT_CFLAGS " -w $(ARCH_FLAG); \ @@ -560,6 +562,7 @@ mjit_config.h: quote "MJIT_DEBUGFLAGS " $(debugflags); \ quote "MJIT_LDSHARED " @LDSHARED@; \ quote "MJIT_DLDFLAGS " @DLDFLAGS@; \ + quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ echo; \ echo '#endif /* RUBY_MJIT_CONFIG_H */'; \ } > $@ |