Skip to content

Commit 99952b4

Browse files
author
bors-servo
authored
Auto merge of #200 - jdm:uwp-rustc-with-cpp-changes, r=asajeffrey
Add cargo feature to build with UWP support. These changes remove a bunch of forbidden API uses. I've tested a local build and it starts up and can successfully JIT some rAF code in a WebGL example. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/mozjs/200) <!-- Reviewable:end -->
2 parents d874462 + 9ad6d4b commit 99952b4

23 files changed

+814
-10
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ exclude = [
1818
[features]
1919
debugmozjs = []
2020
profilemozjs = []
21+
uwp = []
2122

2223
[lib]
2324
name = "mozjs_sys"

build.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ fn build_jsapi() {
120120
if target.contains("gnu") {
121121
println!("cargo:rustc-link-lib=stdc++");
122122
}
123+
if cfg!(feature = "uwp") {
124+
println!("cargo:rustc-link-lib=mincore");
125+
}
123126
} else if target.contains("apple") || target.contains("freebsd") {
124127
println!("cargo:rustc-link-lib=c++");
125128
} else {

0 commit comments

Comments
 (0)