Skip to content

Commit

Permalink
add dockcross as a submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
pschichtel committed Jul 2, 2024
1 parent 1112c4b commit 55ec56f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "dockcross"]
path = dockcross
url = ../dockcross-gradle-plugin.git
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ fun DockcrossRunTask.baseConfigure(linkMode: NativeLinkMode, outputTo: Directory

dependsOn(tasks.compileJava)

val toolchainHome = javaToolchains.launcherFor(java.toolchain).map { it.metadata.installationPath }
javaHome = toolchainHome
javaHome = javaToolchains.launcherFor(java.toolchain).map { it.metadata.installationPath }
output = outputTo.dir("native")

val relativePathToProject = output.get().asFile.toPath().relativize(project.layout.projectDirectory.asFile.toPath()).toString()
Expand Down Expand Up @@ -163,6 +162,7 @@ for (target in targets) {
val nativeForHostOutputDir: Directory = project.layout.buildDirectory.dir("dockcross/host").get()
val compileNativeForHost by tasks.registering(DockcrossRunTask::class) {
baseConfigure(NativeLinkMode.DYNAMIC, nativeForHostOutputDir)
image = "host"
runner(NonContainerRunner)
}

Expand Down
1 change: 1 addition & 0 deletions dockcross
Submodule dockcross added at 95399d

0 comments on commit 55ec56f

Please sign in to comment.