From a01ee103f9bc0c6defe9ce8cd85651f19f7127bd Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 11 Feb 2024 21:29:15 +0000 Subject: Create separate lib for patio runtime --- .../org/shedlang/compiler/backends/llvm/LlvmBackend.java | 12 +++++------- .../org/shedlang/compiler/backends/wasm/WasmBackend.java | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/main/java/org') 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 0f398a79..6c0fb441 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java @@ -145,13 +145,11 @@ public class LlvmBackend implements Backend { clangArgs.add(input.toString()); } - clangArgs.add( - ShedCompilerFiles.getRoot() - .resolve("runtime/target") - .resolve(this.target.targetName()) - .resolve("libshed.a") - .toString() - ); + var runtimeDir = ShedCompilerFiles.getRoot() + .resolve("runtime/target") + .resolve(this.target.targetName()); + clangArgs.add(runtimeDir.resolve("libpatio.a").toString()); + clangArgs.add(runtimeDir.resolve("libshed.a").toString()); clangArgs.addAll(this.target.clangFlags()); 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 913c5c09..759e72e3 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java @@ -128,6 +128,7 @@ public class WasmBackend implements Backend { var runtimeDir = ShedCompilerFiles.getRoot() .resolve("runtime/target") .resolve(this.target.targetName()); + ldArgs.add(runtimeDir.resolve("libpatio.a").toString()); ldArgs.add(runtimeDir.resolve("libshed.a").toString()); ldArgs.add(runtimeDir.resolve("libwalloc.a").toString()); -- cgit v1.2.3