Skip to content

Commit 7aba5e4

Browse files
authored
Merge pull request #124 from jonas/scala-native-0.3.8
Upgrade Scala Native to version 0.3.8
2 parents 2e67588 + e3e0936 commit 7aba5e4

File tree

3 files changed

+3
-22
lines changed

3 files changed

+3
-22
lines changed

build.sbt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,8 @@ lazy val samples = project("samples")
6161
libraryDependencies += "com.lihaoyi" %%% "utest" % "0.6.3" % "test",
6262
testFrameworks += new TestFramework("utest.runner.Framework"),
6363
nativeLinkStubs := true,
64-
Test / nativeLinkingOptions ++= {
65-
val rootDir = (ThisBuild / baseDirectory).value.getAbsoluteFile
66-
val cwd = (Test / target).value.getAbsoluteFile / "bindgen"
67-
val linker = rootDir / "scripts" / "linker.sh"
68-
Seq(s"-L$cwd", s"-fuse-ld=$linker")
64+
Test / nativeLinkingOptions += {
65+
Seq("-L", (Test / target).value.getAbsoluteFile / "bindgen").mkString
6966
},
7067
Test / compile := {
7168
val log = streams.value.log

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.7")
1+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.8")
22
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
33
addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.4.0")
44
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")

scripts/linker.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)