From bcbb87783ccfb8d59c60a433d1fe4663e3541ecb Mon Sep 17 00:00:00 2001 From: develar Date: Thu, 21 Feb 2013 12:46:54 +0400 Subject: [PATCH] findRtJar - support Oracle JDK 1.7 Mac OS X --- compiler/util/src/org/jetbrains/jet/utils/PathUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/util/src/org/jetbrains/jet/utils/PathUtil.java b/compiler/util/src/org/jetbrains/jet/utils/PathUtil.java index 4b5371f7d90..ac6a6aae443 100644 --- a/compiler/util/src/org/jetbrains/jet/utils/PathUtil.java +++ b/compiler/util/src/org/jetbrains/jet/utils/PathUtil.java @@ -143,7 +143,7 @@ public class PathUtil { } private static File findRtJar(String javaHome) { - if (SystemInfo.isMac) { + if (SystemInfo.isMac && !SystemInfo.isJavaVersionAtLeast("1.7")) { File classesJar = new File(new File(javaHome).getParentFile(), "Classes/classes.jar"); if (classesJar.exists()) { return classesJar;