Skip to content

Remove C++ dependency from wasmtime #1365

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
alexcrichton merged 2 commits into from
Mar 20, 2020
Merged

Remove C++ dependency from wasmtime #1365

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e5cef3
Remove C++ dependency from `wasmtime`
alexcrichton Mar 19, 2020
75096b6
Typos
alexcrichton Mar 20, 2020
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
2 changes: 1 addition & 1 deletion crates/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cfg-if = "0.1.9"
backtrace = "0.3.42"

[target.'cfg(target_os = "windows")'.dependencies]
winapi = { version = "0.3.7", features = ["winbase", "memoryapi"] }
winapi = { version = "0.3.7", features = ["winbase", "memoryapi", "errhandlingapi"] }

[build-dependencies]
cc = "1.0"
Expand Down
23 changes: 5 additions & 18 deletions crates/runtime/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
fn main() {
println!("cargo:rerun-if-changed=signalhandlers/SignalHandlers.cpp");
println!("cargo:rerun-if-changed=signalhandlers/SignalHandlers.hpp");
println!("cargo:rerun-if-changed=signalhandlers/Trampolines.cpp");
let target = std::env::var("TARGET").unwrap();
let mut build = cc::Build::new();
build
.cpp(true)
.warnings(false)
.file("signalhandlers/SignalHandlers.cpp")
.file("signalhandlers/Trampolines.cpp");
if !target.contains("windows") {
build
.flag("-std=c++11")
.flag("-fno-exceptions")
.flag("-fno-rtti");
}

build.compile("signalhandlers");
println!("cargo:rerun-if-changed=src/helpers.c");
cc::Build::new()
.warnings(true)
.file("src/helpers.c")
.compile("helpers");
}
Loading