Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/arguments.cpp @ 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 | b8f261ba79c6 |
children | 0e2c530885d1 |
comparison
equal
deleted
inserted
replaced
8212:ed3fa3ae7b61 | 8213:3ebe0b86736e |
---|---|
2219 strcat(altclasses_path, altclasses_jar); | 2219 strcat(altclasses_path, altclasses_jar); |
2220 scp.add_suffix_to_prefix(altclasses_path); | 2220 scp.add_suffix_to_prefix(altclasses_path); |
2221 scp_assembly_required = true; | 2221 scp_assembly_required = true; |
2222 FREE_C_HEAP_ARRAY(char, altclasses_path, mtInternal); | 2222 FREE_C_HEAP_ARRAY(char, altclasses_path, mtInternal); |
2223 } | 2223 } |
2224 | |
2225 #ifdef GRAAL | |
2226 { | |
2227 // Append graal.jar to bootclasspath if enabled | |
2228 const char* jar_file = "graal.jar"; | |
2229 const size_t path_len = strlen(get_meta_index_dir()) + 1 + strlen(jar_file); | |
2230 char* path = NEW_C_HEAP_ARRAY(char, path_len, mtInternal); | |
2231 strcpy(path, get_meta_index_dir()); | |
2232 strcat(path, jar_file); | |
2233 scp.add_suffix(path); | |
2234 scp_assembly_required = true; | |
2235 FREE_C_HEAP_ARRAY(char, path, mtInternal); | |
2236 } | |
2237 #endif | |
2238 | 2224 |
2239 // Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM) | 2225 // Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM) |
2240 result = parse_java_options_environment_variable(&scp, &scp_assembly_required); | 2226 result = parse_java_options_environment_variable(&scp, &scp_assembly_required); |
2241 if (result != JNI_OK) { | 2227 if (result != JNI_OK) { |
2242 return result; | 2228 return result; |