summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-12-06 12:24:42 -0800
committerPaul Phillips <paulp@improving.org>2012-12-06 12:45:09 -0800
commitc35751be33de590d8fbe669cbcb6f3de0d2c711f (patch)
tree663111a5053752abccb8aa8fefc7b03378079f36 /src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
parent6ee2ce50a56237eed07bcc6b6198f97779208a02 (diff)
downloadscala-c35751be33de590d8fbe669cbcb6f3de0d2c711f.tar.gz
scala-c35751be33de590d8fbe669cbcb6f3de0d2c711f.tar.bz2
scala-c35751be33de590d8fbe669cbcb6f3de0d2c711f.zip
Misc touchup after purging msil/fjbg/genjvm.
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala')
-rw-r--r--src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
index ed27c1f1c8..9338d9e5b5 100644
--- a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
@@ -41,7 +41,7 @@ trait StandardScalaSettings {
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. All JVM 1.5 targets are deprecated.",
- List("jvm-1.5", "jvm-1.6", "jvm-1.7"))
+ List("jvm-1.5", "jvm-1.6", "jvm-1.7"), "jvm-1.6")
val unchecked = BooleanSetting ("-unchecked", "Enable additional warnings where generated code depends on assumptions.")
val uniqid = BooleanSetting ("-uniqid", "Uniquely tag all identifiers in debugging output.")
val usejavacp = BooleanSetting ("-usejavacp", "Utilize the java.class.path in classpath resolution.")