Skip to content

Commit

Permalink
enable jna.nosys=true to try and fix appveyor build
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi committed Apr 9, 2018
1 parent 9295d52 commit 135110a
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ object integration extends MillModule{
scalaworker.testArgs() ++
Seq(
"-DMILL_TESTNG=" + testng.runClasspath().map(_.path).mkString(","),
"-DMILL_VERSION=" + build.publishVersion()._2
"-DMILL_VERSION=" + build.publishVersion()._2,
"-Djna.nosys=true"
) ++
(for((k, v) <- testRepos()) yield s"-D$k=$v")
}
Expand Down Expand Up @@ -281,9 +282,14 @@ val isBatch =

object dev extends MillModule{
def moduleDeps = Seq(scalalib, scalajslib)
def forkArgs = T{
scalalib.testArgs() ++ scalajslib.testArgs() ++ scalaworker.testArgs()
}
def forkArgs =
scalalib.testArgs() ++
scalajslib.testArgs() ++
scalaworker.testArgs() ++
// Workaround for Zinc/JNA bug
// https://github.com/sbt/sbt/blame/6718803ee6023ab041b045a6988fafcfae9d15b5/main/src/main/scala/sbt/Main.scala#L130
Seq("-Djna.nosys=true")

def launcher = T{
val isWin = scala.util.Properties.isWin
val outputPath = T.ctx().dest / (if (isBatch) "run.bat" else "run")
Expand Down

0 comments on commit 135110a

Please sign in to comment.