Mercurial > hg > truffle
diff src/os/bsd/vm/os_bsd.cpp @ 14317:b59507f713e0
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
Summary: decoupled the '-XXaltjvm=<path>' option from the gamma launcher. Clearing the way for removing the remaining cruft associated with the previously removed gamma launcher.
Reviewed-by: dcubed, dholmes
author | rdurbin |
---|---|
date | Thu, 30 Jan 2014 14:12:22 -0800 |
parents | 5944dba4badc |
children | b6ab2c9abfc5 8a9bb7821e28 |
line wrap: on
line diff
--- a/src/os/bsd/vm/os_bsd.cpp Thu Jan 30 09:41:45 2014 +0100 +++ b/src/os/bsd/vm/os_bsd.cpp Thu Jan 30 14:12:22 2014 -0800 @@ -1788,12 +1788,14 @@ if (rp == NULL) return; - if (Arguments::created_by_gamma_launcher()) { - // Support for the gamma launcher. Typical value for buf is - // "<JAVA_HOME>/jre/lib/<arch>/<vmtype>/libjvm". If "/jre/lib/" appears at - // the right place in the string, then assume we are installed in a JDK and - // we're done. Otherwise, check for a JAVA_HOME environment variable and - // construct a path to the JVM being overridden. + if (Arguments::sun_java_launcher_is_altjvm()) { + // Support for the java launcher's '-XXaltjvm=<path>' option. Typical + // value for buf is "<JAVA_HOME>/jre/lib/<arch>/<vmtype>/libjvm.so" + // or "<JAVA_HOME>/jre/lib/<vmtype>/libjvm.dylib". If "/jre/lib/" + // appears at the right place in the string, then assume we are + // installed in a JDK and we're done. Otherwise, check for a + // JAVA_HOME environment variable and construct a path to the JVM + // being overridden. const char *p = buf + strlen(buf) - 1; for (int count = 0; p > buf && count < 5; ++count) {