summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-06-22 22:46:37 +0000
committerPaul Phillips <paulp@improving.org>2011-06-22 22:46:37 +0000
commit781726bf7532b48de19c31c3359ab39d8f30899a (patch)
tree4eeea4d61da05ea069357b860af6b4926ccfa413 /src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
parent066ab070e6715abd5fcec5acd54ffa35c26c8467 (diff)
downloadscala-781726bf7532b48de19c31c3359ab39d8f30899a.tar.gz
scala-781726bf7532b48de19c31c3359ab39d8f30899a.tar.bz2
scala-781726bf7532b48de19c31c3359ab39d8f30899a.zip
New theory: fails running on java 1.5.
truth of theory. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala')
-rw-r--r--src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
index c5b477c7bd..4bc9586ae5 100644
--- a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
@@ -39,7 +39,10 @@ trait StandardScalaSettings {
val nowarn = BooleanSetting ("-nowarn", "Generate no warnings.")
val optimise: BooleanSetting // depends on post hook which mutates other settings
val print = BooleanSetting ("-print", "Print program with Scala-specific features removed.")
- val target = ChoiceSetting ("-target", "target", "Target platform for object files.", List("jvm-1.5", "msil"), "jvm-1.5")
+ val target = ChoiceSetting (
+ "-target", "target", "Target platform for object files.",
+ List("jvm-1.5", "jvm-1.6", "msil"), "jvm-1.5"
+ )
val unchecked = BooleanSetting ("-unchecked", "Enable detailed unchecked (erasure) warnings.")
val uniqid = BooleanSetting ("-uniqid", "Uniquely tag all identifiers in debugging output.")
val usejavacp = BooleanSetting ("-usejavacp", "Utilize the java.class.path in classpath resolution.")