diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-08 02:20:14 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-08 02:20:14 +0000 |
| commit | 7aea1e657d6b391b16353e522adad00e71a1d180 (patch) | |
| tree | f41c1b25a8e842b9c9ef648aeda97671666d278c /Makefile.in | |
| parent | 96339a9e1fc0b1b17cb46494b5d5329c109b4d3d (diff) | |
| download | ruby-7aea1e657d6b391b16353e522adad00e71a1d180.tar.gz | |
Honor configured ruby header locations as the MJIT header path
[Bug #15391]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 015f020120..fa1e19ef37 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,6 +45,14 @@ arch = @arch@ sitearch = @sitearch@ sitedir = @sitedir@ archlibdir = @archlibdir@ +includedir = @includedir@ +archincludedir = @archincludedir@ +rubylibprefix = @rubylibprefix@ +rubylibdir = @rubylibdir@ +rubyarchprefix = @rubyarchprefix@ +rubyarchdir = @rubyarchdir@ +rubyhdrdir = @rubyhdrdir@ +rubyarchhdrdir = @rubyarchhdrdir@ ruby_version = @ruby_version@ RUBY_VERSION_NAME = @RUBY_VERSION_NAME@ UNIVERSAL_ARCHNAMES = @UNIVERSAL_ARCHNAMES@ @@ -596,7 +604,11 @@ mjit_config.h: echo '#define RUBY_MJIT_CONFIG_H 1'; \ echo; \ sep=; \ + echo '#ifdef LOAD_RELATIVE'; \ quote MJIT_HEADER_INSTALL_DIR "/$(MJIT_HEADER_INSTALL_DIR)"; \ + echo '#else'; \ + quote MJIT_HEADER_INSTALL_DIR "$(rubyarchhdrdir)"; \ + echo '#endif'; \ quote MJIT_MIN_HEADER_NAME "$(MJIT_MIN_HEADER_NAME)"; \ sep=,; \ quote "MJIT_CC_COMMON " $(MJIT_CC); \ |