# HG changeset patch # User Thomas Wuerthinger # Date 1303899288 -7200 # Node ID 62feb6fd69a9771cc875da46c64ab5e40307a9c8 # Parent 206c5144fe1d3bc6021109b317b65725b2344b36 Adjusted classpaths such that new graalvm repo structure works. diff -r 206c5144fe1d -r 62feb6fd69a9 src/share/vm/runtime/arguments.cpp --- a/src/share/vm/runtime/arguments.cpp Wed Apr 27 11:53:40 2011 +0200 +++ b/src/share/vm/runtime/arguments.cpp Wed Apr 27 12:14:48 2011 +0200 @@ -2682,15 +2682,15 @@ fatal("Must set GRAAL environment variable to a Graal project directory."); } if (PrintVMOptions) tty->print_cr(" GRAAL=%s", graal_dir); - sprintf(temp, "%s/C1X/bin", maxine_dir); - scp_p->add_prefix(temp); sprintf(temp, "%s/CRI/bin", maxine_dir); scp_p->add_prefix(temp); sprintf(temp, "%s/Base/bin", maxine_dir); scp_p->add_prefix(temp); sprintf(temp, "%s/Assembler/bin", maxine_dir); scp_p->add_prefix(temp); - sprintf(temp, "%s/graal/Runtime/bin", graal_dir); + sprintf(temp, "%s/graal/GraalCompiler/bin", graal_dir); + scp_p->add_prefix(temp); + sprintf(temp, "%s/graal/GraalRuntime/bin", graal_dir); scp_p->add_prefix(temp); *scp_assembly_required_p = true; } else if (match_option(option, "-C1X:", &tail)) { // -C1X:xxxx