Auto merge of #28388 - zhengrenzhe:master, r=jdm

support Apple ARM base mac build and run

<!-- Please describe your changes on the following line: -->
i fixed build errors on apple m1 macbook, build and running both successful, but because of this issue: https://github.com/servo/surfman/issues/226, the surfman version must be updated locally by cargo [patch.crates-io]. so this pr is waiting for surfman release new version, and related dependencies update the surfman version.

@jdm

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo 2021-04-24 14:31:13 -04:00 committed by GitHub
commit 50f8e664ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 23 deletions

5
Cargo.lock generated
View file

@ -6148,9 +6148,9 @@ dependencies = [
[[package]]
name = "surfman"
version = "0.4.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84898d7f74abdd4b956334d71d1ddf60e63bff8fd2fa6c91be8653d50d30cbf3"
checksum = "bbbf3b7f873f25cb7791b06a00f0626a141c05f1b95e5b34bc498358876e1a58"
dependencies = [
"bitflags",
"cfg_aliases",
@ -6169,6 +6169,7 @@ dependencies = [
"metal 0.18.0",
"objc",
"parking_lot 0.10.2",
"raw-window-handle",
"wayland-sys 0.24.1",
"winapi",
"winit",