Skip to content

Commit

Permalink
Force fetching x64 zap for mac even on arm. (#26747)
Browse files Browse the repository at this point in the history
* Force fetching x64 zap for mac even on arm.

Apparently arm64 version of zap was pulled.
Rosetta can run x64 just fine, so start
using that instead.

* Update scripts/setup/zap.json

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Update scripts/setup/zap.json

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Update scripts/setup/zap.json

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Restyled by prettier-json

---------

Co-authored-by: Andrei Litvin <andreilitvin@google.com>
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
Co-authored-by: Restyled.io <commits@restyled.io>
  • Loading branch information
4 people authored and pull[bot] committed Jun 24, 2024
1 parent 1e4368e commit 1636594
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion scripts/setup/zap.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@
"linux-amd64",
"linux-arm64",
"mac-amd64",
"mac-arm64",
"windows-amd64"
],
"tags": ["version:2@v2023.05.22-nightly.1"]
},
{
"_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
"path": "fuchsia/third_party/zap/mac-amd64",
"platforms": ["mac-arm64"],
"tags": ["version:2@v2023.05.22-nightly.1"]
}
]
}

0 comments on commit 1636594

Please sign in to comment.