From 4daa20b5fe96005426ab500671361acbeec81acf Mon Sep 17 00:00:00 2001
From: Henry Cook <hcook@eecs.berkeley.edu>
Date: Tue, 28 Jul 2015 15:15:34 -0700
Subject: [PATCH] simplify .sbt files

---
 uncore/build.sbt            | 4 ++++
 uncore/chisel-dependent.sbt | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 uncore/chisel-dependent.sbt

diff --git a/uncore/build.sbt b/uncore/build.sbt
index 35b7dcac..3287e088 100644
--- a/uncore/build.sbt
+++ b/uncore/build.sbt
@@ -6,6 +6,10 @@ name := "uncore"
 
 scalaVersion := "2.10.2"
 
+// Provide a managed dependency on chisel if -DchiselVersion="" is supplied on the command line.
+libraryDependencies ++= (Seq("chisel").map {
+  dep: String => sys.props.get(dep + "Version") map { "edu.berkeley.cs" %% dep % _ }}).flatten
+
 site.settings
 
 site.includeScaladoc()
diff --git a/uncore/chisel-dependent.sbt b/uncore/chisel-dependent.sbt
deleted file mode 100644
index 88eb615c..00000000
--- a/uncore/chisel-dependent.sbt
+++ /dev/null
@@ -1,8 +0,0 @@
-// Provide a managed dependency on chisel if -DchiselVersion="" is
-// supplied on the command line.
-
-val chiselVersion_u = System.getProperty("chiselVersion", "None")
-
-// _u a temporary fix until sbt 13.6 https://github.com/sbt/sbt/issues/1465
-
-libraryDependencies ++= ( if (chiselVersion_u != "None" ) ("edu.berkeley.cs" %% "chisel" % chiselVersion_u) :: Nil; else Nil)