From 318912541940ca30af124c700d45d1f48e56258a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= Date: Sat, 31 Oct 2026 13:27:33 +0100 Subject: [PATCH] fix(cmake-rn): fall back to Unix Makefiles when Ninja is missing Co-Authored-By: Claude Opus 5.5 (1M context) --- .changeset/ninja-makefiles-fallback.md | 5 +++++ packages/cmake-rn/src/ninja.ts | 5 +++++ packages/cmake-rn/src/platforms/android.ts | 12 ++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 .changeset/ninja-makefiles-fallback.md create mode 100644 packages/cmake-rn/src/ninja.ts diff --git a/.changeset/ninja-makefiles-fallback.md b/.changeset/ninja-makefiles-fallback.md new file mode 100644 index 00000000..b580c73d --- /dev/null +++ b/.changeset/ninja-makefiles-fallback.md @@ -0,0 +1,5 @@ +--- +"cmake-rn": patch +--- + +Fall back to Unix Makefiles for Android builds when Ninja isn't installed diff --git a/packages/cmake-rn/src/ninja.ts b/packages/cmake-rn/src/ninja.ts new file mode 100644 index 00000000..d48aebe1 --- /dev/null +++ b/packages/cmake-rn/src/ninja.ts @@ -0,0 +1,5 @@ +import cp from "node:child_process"; + +export function isNinjaAvailable(): boolean { + return cp.spawnSync("ninja", ["--version"]).status === 0; +} diff --git a/packages/cmake-rn/src/platforms/android.ts b/packages/cmake-rn/src/platforms/android.ts index 8364e1ce..61dc0fc1 100644 --- a/packages/cmake-rn/src/platforms/android.ts +++ b/packages/cmake-rn/src/platforms/android.ts @@ -3,6 +3,7 @@ import fs from "node:fs"; import path from "node:path"; import { + chalk, Option, oraPromise, prettyPath, @@ -19,6 +20,7 @@ import { getCmakeJSVariables, getWeakNodeApiVariables, } from "../weak-node-api.js"; +import { isNinjaAvailable } from "../ninja.js"; // This should match https://github.com/react-native-community/template/blob/main/template/android/build.gradle#L7 const DEFAULT_NDK_VERSION = "27.1.12297006"; @@ -121,7 +123,6 @@ export function buildCommonDefinitions({ CMAKE_BUILD_TYPE: configuration, CMAKE_SYSTEM_NAME: "Android", // "CMAKE_INSTALL_PREFIX": installPath, - CMAKE_MAKE_PROGRAM: "ninja", ANDROID_NDK: ndkPath, ANDROID_TOOLCHAIN: "clang", ANDROID_PLATFORM: androidSdkVersion, @@ -198,6 +199,13 @@ export const platform: Platform = { define, }); + const generator = isNinjaAvailable() ? "Ninja" : "Unix Makefiles"; + if (generator !== "Ninja") { + console.log( + `Ninja not found, using ${generator}. ${chalk.dim("Install Ninja for faster builds.")}`, + ); + } + await Promise.all( triplets.map(async ({ triplet, spawn }) => { const buildPath = getBuildPath(build, triplet, configuration); @@ -216,7 +224,7 @@ export const platform: Platform = { // Ideally, we would use the "Ninja Multi-Config" generator here, // but it doesn't support the "RelWithDebInfo" configuration on Android. "-G", - "Ninja", + generator, "--toolchain", toolchainPath, ...toDefineArguments([