diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-18 10:28:02 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-18 10:28:02 -0700 |
| commit | 9736f97a9765dade23fef7131fa9b34229b5feef (patch) | |
| tree | 14e2956793ffb8edbf2a7aaa7cf620fcefe4dd34 /src/library | |
| parent | 70a93f52c3efafe604d6547b335cc361deff4f29 (diff) | |
| parent | 9cabcf2d2dcdd0917c48e5f081d90f5c5cfe0e99 (diff) | |
| download | scala-9736f97a9765dade23fef7131fa9b34229b5feef.tar.gz scala-9736f97a9765dade23fef7131fa9b34229b5feef.tar.bz2 scala-9736f97a9765dade23fef7131fa9b34229b5feef.zip | |
Merge pull request #2561 from soc/SI-7479
SI-7479 Make test/files/run/tailcalls.scala pass on Avian
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 2240dde360..fef9cef246 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -146,6 +146,9 @@ private[scala] trait PropertiesTrait { /** Returns `true` iff the underlying operating system is a version of Apple Mac OSX. */ def isMac = osName startsWith "Mac OS X" + /* Some runtime values. */ + private[scala] def isAvian = javaVmName contains "Avian" + // This is looking for javac, tools.jar, etc. // Tries JDK_HOME first, then the more common but likely jre JAVA_HOME, // and finally the system property based javaHome. |