Skip to content
This repository was archived by the owner on May 30, 2023. It is now read-only.

feat: support target wasm-unknown-emscripten #100

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: support target wasm-unknown-emscripten #100

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6662331
feat: add wasm-unknown-emscripten target support
0neSe7en Sep 7, 2021
28a4a16
fix: add clang arg -fvisibility=default
0neSe7en Sep 7, 2021
cdc1d24
Merge branch 'master' into wasm-emscripten
kornelski Jan 4, 2022
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
9 changes: 9 additions & 0 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,7 @@ fn main() {
fn thread_main() {
let statik = env::var("CARGO_FEATURE_STATIC").is_ok();
let target = env::var("TARGET").unwrap();
let is_wasm_emscripten = target == "wasm32-unknown-emscripten";
let target_os = os_from_triple(&target); // it's different than Rust's target_os! but ./configure likes these better

let include_paths: Vec<PathBuf> = if env::var("CARGO_FEATURE_BUILD").is_ok() {
Expand Down Expand Up @@ -1107,6 +1108,7 @@ fn thread_main() {
// the resulting bindings.
let mut builder = bindgen::Builder::default()
.clang_args(clang_includes)
.clang_arg("-fvisibility=default")
.ctypes_prefix("libc")
// https://github.com/rust-lang/rust-bindgen/issues/550
.blocklist_type("max_align_t")
Expand Down Expand Up @@ -1204,6 +1206,13 @@ fn thread_main() {
.size_t_is_usize(true)
.parse_callbacks(Box::new(Callbacks));

if is_wasm_emscripten {
let emsdk_path = PathBuf::from(env::var("EMSDK").unwrap());
Copy link
Collaborator

@kornelski kornelski Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this guaranteed to be set?

At very least I'd prefer it to be .expect() with a message that explains what it should contain.

Copy link
Author

@0neSe7en 0neSe7en Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And may add document about target=wasm32-unknown-emscripten in README.md or somewhere else?
User need to install EMSDK and activate it, and compiling FFmpeg with Emscripten also not easy

let emsdk_sysroot = emsdk_path.join("upstream/emscripten/cache/sysroot");
Copy link
Collaborator

@kornelski kornelski Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cache/ doesn't make it sound like a permanent directory.

Maybe check if the path exists and panic with an error that tells user how to create it?

builder = builder
.clang_arg(format!("--sysroot={}", emsdk_sysroot.to_string_lossy()));
}

// The input headers we would like to generate
// bindings for.
if env::var("CARGO_FEATURE_AVCODEC").is_ok() {
Expand Down