swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: only link c++_shared, don't link c++ always

Browse Source
This commit is contained in:
Jonathan Kelley committed 2025-07-14 15:47:46 -07:00
1 parent 3f62cd8fc0
commit 2dec6205c8
1 file changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli/src/build/request.rs
+2 -3
View File
@@ -662,7 +662,6 @@ impl BuildRequest {
"-Clink-arg=-landroid".to_string(), "-Clink-arg=-landroid".to_string(),
"-Clink-arg=-llog".to_string(), "-Clink-arg=-llog".to_string(),
"-Clink-arg=-lOpenSLES".to_string(), "-Clink-arg=-lOpenSLES".to_string(),
"-Clink-arg=-lc++".to_string(),
"-Clink-arg=-lc++abi".to_string(), "-Clink-arg=-lc++abi".to_string(),
"-Clink-arg=-Wl,--export-dynamic".to_string(), "-Clink-arg=-Wl,--export-dynamic".to_string(),
format!( format!(
@@ -1129,9 +1128,9 @@ impl BuildRequest {
} }
} }
// On android, the c++_static flag means we need to copy the libc++_shared.so precompiled // On android, the c++_shared flag means we need to copy the libc++_shared.so precompiled
// library to the jniLibs folder // library to the jniLibs folder
if arg.contains("-lc++_static") && self.platform == Platform::Android { if arg.contains("-lc++_shared") && self.platform == Platform::Android {
std::fs::copy( std::fs::copy(
self.workspace.android_tools()?.libcpp_shared(&self.triple), self.workspace.android_tools()?.libcpp_shared(&self.triple),
framework_dir.join("libc++_shared.so"), framework_dir.join("libc++_shared.so"),