Skip to content

Recognize .abi3.so native extensions in linker scanner #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dicej merged 2 commits into from
Mar 25, 2026
Merged

Recognize .abi3.so native extensions in linker scanner #208

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c34acc5
Recognize .abi3.so native extensions in linker scanner
kesmit13 Mar 25, 2026
b5f6d04
Run cargo fmt
kesmit13 Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/prelink.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@ use zstd::Decoder;

use crate::{ComponentizePyConfig, ConfigContext, Library, RawComponentizePyConfig};

static NATIVE_EXTENSION_SUFFIX: &str = ".cpython-314-wasm32-wasi.so";
static NATIVE_EXTENSION_SUFFIXES: &[&str] = &[".cpython-314-wasm32-wasi.so", ".abi3.so"];

/// Check if a file starts with the WASM magic bytes (`\0asm`).
fn is_wasm_file(path: &Path) -> bool {
fs::read(path)
.map(|bytes| bytes.starts_with(b"\0asm"))
.unwrap_or(false)
}

type ConfigsMatchedWorlds<'a> =
IndexMap<String, (ConfigContext<ComponentizePyConfig>, Option<&'a str>)>;
Expand Down Expand Up @@ -235,7 +242,11 @@ fn search_directory(
search_directory(root, &entry?.path(), libraries, configs, modules_seen)?;
}
} else if let Some(name) = path.file_name().and_then(|name| name.to_str()) {
if name.ends_with(NATIVE_EXTENSION_SUFFIX) {
if NATIVE_EXTENSION_SUFFIXES
.iter()
.any(|suffix| name.ends_with(suffix))
&& is_wasm_file(path)
{
libraries.push(path.to_owned());
} else if name == "componentize-py.toml" {
let root = root
Expand Down
Loading