From 0908a609fc1ad35308796b0bad1e05d37bfdb331 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 19 Mar 2024 16:56:46 +0000 Subject: Use Python script to build runtime --- src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java | 7 ++++--- src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java | 7 ++++--- .../java/org/shedlang/compiler/filesystem/ShedCompilerFiles.java | 7 +++++++ 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java index 6c0fb441..e000ccaf 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java @@ -145,9 +145,10 @@ public class LlvmBackend implements Backend { clangArgs.add(input.toString()); } - var runtimeDir = ShedCompilerFiles.getRoot() - .resolve("runtime/target") - .resolve(this.target.targetName()); + var runtimeDir = ShedCompilerFiles.targetDir( + this.target.targetName(), + "mark-and-sweep" + ); clangArgs.add(runtimeDir.resolve("libpatio.a").toString()); clangArgs.add(runtimeDir.resolve("libshed.a").toString()); diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java index 759e72e3..8c1f64f0 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java @@ -125,9 +125,10 @@ public class WasmBackend implements Backend { ldArgs.add(input.toString()); } - var runtimeDir = ShedCompilerFiles.getRoot() - .resolve("runtime/target") - .resolve(this.target.targetName()); + var runtimeDir = ShedCompilerFiles.targetDir( + this.target.targetName(), + "mark-and-sweep" + ); ldArgs.add(runtimeDir.resolve("libpatio.a").toString()); ldArgs.add(runtimeDir.resolve("libshed.a").toString()); ldArgs.add(runtimeDir.resolve("libwalloc.a").toString()); diff --git a/src/main/java/org/shedlang/compiler/filesystem/ShedCompilerFiles.java b/src/main/java/org/shedlang/compiler/filesystem/ShedCompilerFiles.java index 62e61567..5c195448 100644 --- a/src/main/java/org/shedlang/compiler/filesystem/ShedCompilerFiles.java +++ b/src/main/java/org/shedlang/compiler/filesystem/ShedCompilerFiles.java @@ -10,4 +10,11 @@ public class ShedCompilerFiles { // TODO: don't assume we're in the project root return Path.of("."); } + + public static Path targetDir(String targetName, String profileName) { + return getRoot() + .resolve("runtime/target") + .resolve(targetName) + .resolve(profileName); + } } -- cgit v1.2.3