From 600c5d50a9b870a632ee098d61eb47a74bcc7584 Mon Sep 17 00:00:00 2001 From: Scott Beamer Date: Tue, 2 Sep 2014 15:14:56 -0700 Subject: [PATCH] better fix with explanation of sbt issue --- rocket/chisel-dependent.sbt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rocket/chisel-dependent.sbt b/rocket/chisel-dependent.sbt index c65c7811..1681364e 100644 --- a/rocket/chisel-dependent.sbt +++ b/rocket/chisel-dependent.sbt @@ -1,8 +1,10 @@ // Provide a managed dependency on chisel if -DchiselVersion="" is // supplied on the command line. -lazy val chiselVersion = System.getProperty("chiselVersion", "None") +val chiselVersion_r = System.getProperty("chiselVersion", "None") -libraryDependencies ++= ( if (chiselVersion != "None" ) ( - "edu.berkeley.cs" %% "chisel" % chiselVersion +// _r a temporary fix until sbt 13.6 https://github.com/sbt/sbt/issues/1465 + +libraryDependencies ++= ( if (chiselVersion_r != "None" ) ( + "edu.berkeley.cs" %% "chisel" % chiselVersion_r ) :: Nil; else Nil)