aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2016-10-29 00:08:02 +0200
committerGuillaume Martres <smarter@ubuntu.com>2016-11-22 01:35:06 +0100
commit5c34122645a6e3a75459de9cf381bb20ca2d67dd (patch)
tree8f097fa8d55808dbcf1bb13fdf68da9b84da5b1a /project
parentc65591c3672837588f318db2652a9001f674f8f7 (diff)
downloaddotty-5c34122645a6e3a75459de9cf381bb20ca2d67dd.tar.gz
dotty-5c34122645a6e3a75459de9cf381bb20ca2d67dd.tar.bz2
dotty-5c34122645a6e3a75459de9cf381bb20ca2d67dd.zip
Fix "sbt run"
Broken since the dotty jars were removed from the JVM bootclasspath. I think the proper solution is to use the Scala bootclasspath to pass all the necessary jars but this will do for now.
Diffstat (limited to 'project')
-rw-r--r--project/Build.scala3
1 files changed, 3 insertions, 0 deletions
diff --git a/project/Build.scala b/project/Build.scala
index 44ac58efa..9eb8cb894 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -198,6 +198,9 @@ object DottyBuild extends Build {
// Add git-hash used to package the distribution to the manifest to know it in runtime and report it in REPL
packageOptions += ManifestAttributes(("Git-Hash", VersionUtil.gitHash)),
+ // FIXME: Do something more sensible, like using the Scala bootclasspath
+ run <<= (run in Compile).partialInput(" -usejavacp"),
+
// http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
// packageAll should always be run before tests
javaOptions <++= (dependencyClasspath in Runtime, packageAll) map { (attList, _) =>