mjit.c: don't apply workaround if --enable-load-relative

is specified.

This is needed for MinGW because MJIT_BUILD_DIR doesn't prefix path
like "C:\msys64", so it can't be read without msys2's conversion.

The workaround is not needed for Windows (LOAD_RELATIVE looks defined by
default) anyway. So removed it for such environment.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 5 deletions

diff --git a/mjit.c b/mjit.c
index efe281fb22..e292c27017 100644
--- a/mjit.c
+++ b/mjit.c
@@ -1478,6 +1478,11 @@ init_header_filename(void)
     const size_t libpathflag_len = sizeof(libpathflag) - 1;
 #endif
 
+    basedir_val = ruby_prefix_path;
+    basedir = StringValuePtr(basedir_val);
+    baselen = RSTRING_LEN(basedir_val);
+
+#ifndef LOAD_RELATIVE
     if (getenv("MJIT_SEARCH_BUILD_DIR")) {
         /* This path is not intended to be used on production, but using build directory's
            header file here because people want to run `make test-all` without running
@@ -1485,11 +1490,7 @@ init_header_filename(void)
         basedir = MJIT_BUILD_DIR;
         baselen = strlen(basedir);
     }
-    else {
-        basedir_val = ruby_prefix_path;
-        basedir = StringValuePtr(basedir_val);
-        baselen = RSTRING_LEN(basedir_val);
-    }
+#endif
 
     header_file = xmalloc(baselen + header_name_len + 1);
     p = append_str2(header_file, basedir, baselen);