diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2011-06-23 10:26:42 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2011-06-23 10:26:42 +0000 |
| commit | 5dc127e69cae1d88aa6910ea6378ad5dc1aaeaab (patch) | |
| tree | 3b503f9a95befb935c10f494eec36afa55efeba3 /src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala | |
| parent | b924c4142de1ca6525a3d5e57ecfb7a345dd9f89 (diff) | |
| download | scala-5dc127e69cae1d88aa6910ea6378ad5dc1aaeaab.tar.gz scala-5dc127e69cae1d88aa6910ea6378ad5dc1aaeaab.tar.bz2 scala-5dc127e69cae1d88aa6910ea6378ad5dc1aaeaab.zip | |
getting the revamped getClass to work on Java 5
hunch by adriaan (needed to change Object to Any in strategic location),
location + fix determined by paul,
menial work (reverts of obsolete spears and introduction of fix) by
adriaan
review by extempore
Revert "A line missed from spear thrust, no review. Revert "
"Thrusting spear into darkened alcove attempting to slay java5 "
Revert "New theory: fails running on java 1.5. Put in hack to "
discover Revert "Everything builds for me, but apparently not for "
jenkins. First "
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala index 4bc9586ae5..c5b477c7bd 100644 --- a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala @@ -39,10 +39,7 @@ 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.6", "msil"), "jvm-1.5" - ) + val target = ChoiceSetting ("-target", "target", "Target platform for object files.", List("jvm-1.5", "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.") |