Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr: fix exception unwind linking

Browse source
This commit is contained in:
Alexander Capehart 2025-02-19 10:43:07 -07:00
parent 57eb30701d
commit e68242b8ee
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
musikr/src/main/jni/build.rs
View file

@ -61,7 +61,7 @@ fn main() {
cmake_args.extend(vec![ cmake_args.extend(vec![
format!("-DANDROID_NDK_PATH={}", ndk_path), format!("-DANDROID_NDK_PATH={}", ndk_path),
format!("-DCMAKE_TOOLCHAIN_FILE={}", ndk_toolchain.to_str().unwrap()), format!("-DCMAKE_TOOLCHAIN_FILE={}", ndk_toolchain.to_str().unwrap()),
format!("-DANDROID_ABI={}", arch), format!("-DANDROID_ABI={}", arch)
]); ]);
} }
@ -111,7 +111,9 @@ fn main() {
arch_pkg_dir.display() arch_pkg_dir.display()
); );
println!("cargo:rustc-link-lib=static=tag"); println!("cargo:rustc-link-lib=static=tag");
// println!("cargo:rustc-link-lib=cc++_static"); println!("cargo:rustc-link-lib=static=c++_static");
println!("cargo:rustc-link-lib=static=c++abi");
println!("cargo:rustc-link-lib=unwind");
// Build the shim and cxx bridge together // Build the shim and cxx bridge together
let mut builder = cxx_build::bridge("src/taglib/bridge.rs"); let mut builder = cxx_build::bridge("src/taglib/bridge.rs");
@ -128,8 +130,12 @@ fn main() {
.include(".") // Add the current directory to include path .include(".") // Add the current directory to include path
.flag_if_supported("-std=c++14"); .flag_if_supported("-std=c++14");
if is_android { if is_android {
builder.cpp_link_stdlib("c++_static"); // Use shared C++ runtime for Android compatibility builder.cpp_link_stdlib("c++_static")
.flag("-static-libstdc++")
.flag("-fexceptions")
.flag("-funwind-tables"); // Use shared C++ runtime for Android compatibility
} }
builder.compile("taglib_cxx_bindings"); builder.compile("taglib_cxx_bindings");