fix: ensure libunwind is linked on linux

GetFirefly · Feb 27, 2023 · 4089b68 · 4089b68
1 parent a944b81
commit 4089b68
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler/linker/src/lib.rs b/compiler/linker/src/lib.rs
@@ -146,17 +146,24 @@ impl ProjectInfo {
             .map(|t| t.dir.clone())
             .unwrap_or_else(|| options.host_tlib_path.dir.clone());
         let prefix = &options.target.options.staticlib_prefix;
-        info.used_deps
-            .push(match options.target.options.panic_strategy {
-                PanicStrategy::Abort => Dependency {
+        match options.target.options.panic_strategy {
+            PanicStrategy::Abort => {
+                info.used_deps.push(Dependency {
                     name: Symbol::intern("panic_abort"),
                     source: Some(fireflylib_dir.join(&format!("{}panic_abort.rlib", prefix))),
-                },
-                PanicStrategy::Unwind => Dependency {
+                });
+            }
+            PanicStrategy::Unwind => {
+                info.used_deps.push(Dependency {
                     name: Symbol::intern("panic_unwind"),
                     source: Some(fireflylib_dir.join(&format!("{}panic_unwind.rlib", prefix))),
-                },
-            });
+                });
+                info.used_deps.push(Dependency {
+                    name: Symbol::intern("unwind"),
+                    source: Some(fireflylib_dir.join(&format!("{}unwind.rlib", prefix))),
+                });
+            }
+        }
         if options.target.options.is_like_wasm {
             info.used_deps.push(Dependency {
                 name: Symbol::intern("firefly_emulator"),

diff --git a/firefly/Cargo.toml b/firefly/Cargo.toml
@@ -29,3 +29,4 @@ log.workspace = true
 [build-dependencies]
 firefly_crt = { path = "../runtimes/crt" }
 firefly_emulator = { path = "../runtimes/emulator" }
+unwind = { path = "../compiler/unwind" }
diff --git a/tools/firefly-make/src/build.rs b/tools/firefly-make/src/build.rs
@@ -476,7 +476,7 @@ pub fn run(config: &Config) -> anyhow::Result<()> {
 
     println!("Installing runtime libraries..");
 
-    let firefly_libs = &["firefly_emulator"];
+    let firefly_libs = &["firefly_emulator", "unwind"];
     for lib in firefly_libs.iter().copied() {
         if let Some(files) = deps.get(lib) {
             for file in files.iter() {