Skip to content

Commit

Permalink
ninja: upgrade and build from source on macOS
Browse files Browse the repository at this point in the history
Summary:
On macOS, ninja only provides prebuilt Intel binaries, not arm64 ones. Since we
need to have a native arm64 ninja to be able to build binaries for the M1,
let's compile it from scratch on macOS too. Compiling it takes less than 30s so
it shouldn't add any notable cost to any builds.

Reviewed By: genevievehelsel

Differential Revision: D26322029

fbshipit-source-id: 1bbeeac2a3f0ba07c477a2b33f8878a91ccaec0e
  • Loading branch information
xavierd authored and facebook-github-bot committed Feb 9, 2021
1 parent c8fcdcd commit e258dfe
Showing 1 changed file with 8 additions and 15 deletions.
23 changes: 8 additions & 15 deletions build/fbcode_builder/manifests/ninja
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,19 @@ ninja-build
ninja-build

[download.os=windows]
url = https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip
sha256 = 2d70010633ddaacc3af4ffbd21e22fae90d158674a09e132e06424ba3ab036e9
url = https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip
sha256 = bbde850d247d2737c5764c927d1071cbb1f1957dcabda4a130fa8547c12c695f

[build.not(os=linux)]
[build.os=windows]
builder = nop

[install.files.os=windows]
ninja.exe = bin/ninja.exe

[download.os=darwin]
url = https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-mac.zip
sha256 = 26d32a79f786cca1004750f59e545199bf110e21e300d3c2424c1fddd78f28ab
[download.not(os=windows)]
url = https://github.com/ninja-build/ninja/archive/v1.10.2.tar.gz
sha256 = ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed

[download.os=linux]
url = https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz
sha256 = 5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9

[install.files.os=darwin]
ninja = bin/ninja

[build.os=linux]
[build.not(os=windows)]
builder = ninja_bootstrap
subdir = ninja-1.9.0
subdir = ninja-1.10.2

0 comments on commit e258dfe

Please sign in to comment.