From ef20db1aa97e75e4bfa416ef097b6b459fad0582 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 2 May 2011 19:35:42 -0400 Subject: [PATCH] clear scala-home during cross-building --- main/Cross.scala | 2 +- project/build/XSbt.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/Cross.scala b/main/Cross.scala index 6b8655fd9..7eb9bebff 100644 --- 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 index a924753bb..41ab15e20 100644 --- 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")