Mercurial > hg > truffle
changeset 8213:3ebe0b86736e
simplified addition of graal.jar to the bootclasspath (CR-102)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 11 Mar 2013 18:58:42 +0100 |
| parents | ed3fa3ae7b61 |
| children | aadd8f02449a |
| files | src/share/vm/runtime/arguments.cpp src/share/vm/runtime/os.cpp |
| diffstat | 2 files changed, 3 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Mon Mar 11 18:57:12 2013 +0100 +++ b/src/share/vm/runtime/arguments.cpp Mon Mar 11 18:58:42 2013 +0100 @@ -2222,20 +2222,6 @@ FREE_C_HEAP_ARRAY(char, altclasses_path, mtInternal); } -#ifdef GRAAL - { - // Append graal.jar to bootclasspath if enabled - const char* jar_file = "graal.jar"; - const size_t path_len = strlen(get_meta_index_dir()) + 1 + strlen(jar_file); - char* path = NEW_C_HEAP_ARRAY(char, path_len, mtInternal); - strcpy(path, get_meta_index_dir()); - strcat(path, jar_file); - scp.add_suffix(path); - scp_assembly_required = true; - FREE_C_HEAP_ARRAY(char, path, mtInternal); - } -#endif - // Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM) result = parse_java_options_environment_variable(&scp, &scp_assembly_required); if (result != JNI_OK) {
--- a/src/share/vm/runtime/os.cpp Mon Mar 11 18:57:12 2013 +0100 +++ b/src/share/vm/runtime/os.cpp Mon Mar 11 18:58:42 2013 +0100 @@ -1149,6 +1149,9 @@ #ifdef __APPLE__ "%/lib/JObjC.jar:" #endif +#ifdef GRAAL + "%/lib/graal.jar:" +#endif "%/classes"; char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); if (sysclasspath == NULL) return false;