diff options
| author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-31 12:43:06 +0000 |
|---|---|---|
| committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-31 12:43:06 +0000 |
| commit | 11974fc010b9aba4a4fee3ecdfb27003ba36a6eb (patch) | |
| tree | af04e13ee66ad9b16930ac3fefead4bcecc2082f /win32 | |
| parent | c4734308b6d0c7c7fea3705fa2d4af293df2657a (diff) | |
mjit.c: allow using MJIT header in build directory
when $MJIT_SEARCH_BUILD_DIR is set.
If prefix path is owned by root, `make install` needs to be run by root.
But in general we don't want to run `make test-all`, and also running
`make test-all` currently fails due to permission tests of rdoc and rubygems.
Thus, prior to this commit, specifying a prefix like "/usr/local" could
mean there was no way to pass test-all.
So we should not depend on `make install` for `make test-all`. Thus I
reverted r64104 and r64103, and applied this workaround to pass `make
test-all` without `make install`.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index becc6c2057..fff0e55d75 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1295,6 +1295,7 @@ mjit_config.h: #ifndef RUBY_MJIT_CONFIG_H #define RUBY_MJIT_CONFIG_H 1 +#define MJIT_BUILD_DIR "$(MAKEDIR)" #define MJIT_MIN_HEADER_NAME "/$(MJIT_HEADER_INSTALL_DIR)/$(MJIT_MIN_HEADER_NAME)" <<KEEP @ |