Skip to content

Commit 0cd8797

Browse files
xavierdfacebook-github-bot
authored andcommitted
ninja: upgrade and build from source on macOS
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
1 parent f5ba8eb commit 0cd8797

1 file changed

Lines changed: 8 additions & 15 deletions

File tree

  • build/fbcode_builder/manifests

build/fbcode_builder/manifests/ninja

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,19 @@ ninja-build
88
ninja-build
99

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

14-
[build.not(os=linux)]
14+
[build.os=windows]
1515
builder = nop
1616

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

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

24-
[download.os=linux]
25-
url = https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz
26-
sha256 = 5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9
27-
28-
[install.files.os=darwin]
29-
ninja = bin/ninja
30-
31-
[build.os=linux]
24+
[build.not(os=windows)]
3225
builder = ninja_bootstrap
33-
subdir = ninja-1.9.0
26+
subdir = ninja-1.10.2

0 commit comments

Comments
 (0)