From a03b486101876c963e33b8c2c405e91ddd3fa078 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Thu, 29 Dec 2011 21:18:03 +0400 Subject: [PATCH] Getting java home isn't that hard if you're running java code --- .../src/org/jetbrains/jet/compiler/CompileEnvironment.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/compiler/backend/src/org/jetbrains/jet/compiler/CompileEnvironment.java b/compiler/backend/src/org/jetbrains/jet/compiler/CompileEnvironment.java index 2d2722e4810..63f7507da79 100644 --- a/compiler/backend/src/org/jetbrains/jet/compiler/CompileEnvironment.java +++ b/compiler/backend/src/org/jetbrains/jet/compiler/CompileEnvironment.java @@ -97,6 +97,13 @@ public class CompileEnvironment { public static File findRtJar(boolean failOnError) { String javaHome = System.getenv("JAVA_HOME"); + if (javaHome == null) { + javaHome = System.getProperty("java.home"); + if ("jre".equals(new File(javaHome).getName())) { + javaHome = new File(javaHome).getParent(); + } + } + File rtJar; if (javaHome == null) { rtJar = findActiveRtJar(failOnError);