clear scala-home during cross-building

harrah · May 2, 2011 · ef20db1 · ef20db1
1 parent b2c9e87
commit ef20db1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/main/Cross.scala b/main/Cross.scala
@@ -21,7 +21,7 @@ object Cross
 	lazy val switchVersion = Command.arb(requireSession(switchParser)) { case (state, (version, command)) =>
 		val x = Project.extract(state)
 			import x._
-		val add = (scalaVersion := version) :: Nil
+		val add = (scalaVersion :== version) :: (scalaHome :== None) :: Nil
 		val append = Load.transformSettings(Load.projectScope(currentRef), currentRef.build, rootProject, add)
 		val newStructure = Load.reapply(session.original ++ append, structure)
 		Project.setProject(session, newStructure, command :: state)

diff --git a/project/build/XSbt.scala b/project/build/XSbt.scala
@@ -302,7 +302,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
 
 		// sub projects for each version of Scala to precompile against other than the one sbt is built against
 		// each sub project here will add ~100k to the download
-		lazy val precompiled29 = precompiledSub("2.9.0.RC1")
+		lazy val precompiled29 = precompiledSub("2.9.0.RC2")
 		lazy val precompiled28 = precompiledSub("2.8.0")
 		lazy val precompiled27 = precompiledSub("2.7.7")