diff options
| author | Miguel Garcia <miguelalfredo.garcia@epfl.ch> | 2012-07-06 17:06:57 +0200 |
|---|---|---|
| committer | Miguel Garcia <miguelalfredo.garcia@epfl.ch> | 2012-07-06 17:06:57 +0200 |
| commit | dc6a49337f072686516c14f50b847c38cbc6c225 (patch) | |
| tree | 059776e0a5e5d3e31551c5f034b644d8df1462eb /src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala | |
| parent | c39c7276c38f9ef66fd7054609ef33627efe5177 (diff) | |
| download | scala-dc6a49337f072686516c14f50b847c38cbc6c225.tar.gz scala-dc6a49337f072686516c14f50b847c38cbc6c225.tar.bz2 scala-dc6a49337f072686516c14f50b847c38cbc6c225.zip | |
GenASM becomes default backend, 1.5 classfiles remain as default
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala index 1bb0948168..f0ee8b11f3 100644 --- a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala @@ -40,7 +40,9 @@ 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", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7", "msil"), "jvm-1.5") + val target = ChoiceSetting ("-target", "target", "Target platform for object files.", + List("jvm-1.5", "jvm-1.5-fjbg", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7", "msil"), + "jvm-1.5-asm") 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.") |