diff options
author | James Iry <james.iry@typesafe.com> | 2012-12-05 12:43:34 -0800 |
---|---|---|
committer | James Iry <james.iry@typesafe.com> | 2012-12-05 14:36:50 -0800 |
commit | 06844ee821ae500c7485498cc2054e3cf765623f (patch) | |
tree | 9466d012307dcbe2fcb8c6226eaa05e938e51c4a /src/compiler/scala/tools/nsc/backend/JavaPlatform.scala | |
parent | 4b2330b3d3db4263a8b1e19b792596dd60d79045 (diff) | |
download | scala-06844ee821ae500c7485498cc2054e3cf765623f.tar.gz scala-06844ee821ae500c7485498cc2054e3cf765623f.tar.bz2 scala-06844ee821ae500c7485498cc2054e3cf765623f.zip |
SI-6769 Removes GenJVM backend
Get rid of GenJVM and everything that refers to it.
Also get rid of GenAndroid since it's dead code that refers to GenJVM.
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/JavaPlatform.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/JavaPlatform.scala | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala b/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala index fd4366baf1..5cc4404ca1 100644 --- a/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala +++ b/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala @@ -42,13 +42,9 @@ trait JavaPlatform extends Platform { if (settings.make.isDefault) Nil else List(dependencyAnalysis) - private def classEmitPhase = - if (settings.target.value == "jvm-1.5-fjbg") genJVM - else genASM - def platformPhases = List( flatten, // get rid of inner classes - classEmitPhase // generate .class files + genASM // generate .class files ) ++ depAnalysisPhase lazy val externalEquals = getDecl(BoxesRunTimeClass, nme.equals_) |