stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8318700: MacOS Zero cannot run gtests due to wrong JVM path

Browse Source 
Reviewed-by: dholmes
This commit is contained in:
Aleksey Shipilev 2023-10-26 12:34:45 +00:00
parent ec1bf23d01
commit 744e089310
1 changed files with 8 additions and 6 deletions

14
src/hotspot/os/bsd/os_bsd.cpp

@ -202,11 +202,13 @@ static char cpu_arch[] = "ppc";
#error Add appropriate cpu_arch setting
#endif
// Compiler variant
#ifdef COMPILER2
#define COMPILER_VARIANT "server"
// JVM variant
#if defined(ZERO)
#define JVM_VARIANT "zero"
#elif defined(COMPILER2)
#define JVM_VARIANT "server"
#else
#define COMPILER_VARIANT "client"
#define JVM_VARIANT "client"
#endif
@ -1501,10 +1503,10 @@ void os::jvm_path(char *buf, jint buflen) {
snprintf(jrelib_p, buflen-len, "/lib");
}
// Add the appropriate client or server subdir
// Add the appropriate JVM variant subdir
len = strlen(buf);
jrelib_p = buf + len;
snprintf(jrelib_p, buflen-len, "/%s", COMPILER_VARIANT);
snprintf(jrelib_p, buflen-len, "/%s", JVM_VARIANT);
if (0 != access(buf, F_OK)) {
snprintf(jrelib_p, buflen-len, "%s", "");
}