Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use_repo(
"glib_src",
"gnumake_src",
"meson_src",
"ninja_1.13.0_toolchains",
"ninja_1.13.1_toolchains",
"ninja_build_src",
"pkgconfig_src",
"rules_foreign_cc_framework_toolchains",
Expand All @@ -42,7 +42,7 @@ use_repo(
register_toolchains(
"@rules_foreign_cc_framework_toolchains//:all",
"@cmake_3.31.8_toolchains//:all",
"@ninja_1.13.0_toolchains//:all",
"@ninja_1.13.1_toolchains//:all",
"@python_3_12//:all",
"@rules_foreign_cc//toolchains:all",
)
2 changes: 1 addition & 1 deletion foreign_cc/extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ load("//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
load("//toolchains:prebuilt_toolchains.bzl", "prebuilt_toolchains")

_DEFAULT_CMAKE_VERSION = "3.31.8"
_DEFAULT_NINJA_VERSION = "1.13.0"
_DEFAULT_NINJA_VERSION = "1.13.1"

cmake_toolchain_version = tag_class(attrs = {
"version": attr.string(doc = "The cmake version", default = _DEFAULT_CMAKE_VERSION),
Expand Down
2 changes: 1 addition & 1 deletion foreign_cc/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def rules_foreign_cc_dependencies(
register_default_tools = True,
cmake_version = "3.31.8",
make_version = "4.4.1",
ninja_version = "1.13.0",
ninja_version = "1.13.1",
meson_version = "1.5.1",
pkgconfig_version = "0.29.2",
register_preinstalled_tools = True,
Expand Down
111 changes: 111 additions & 0 deletions toolchains/prebuilt_toolchains.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -11352,6 +11352,117 @@ def _cmake_toolchains(version, register_toolchains):
fail("Unsupported version: " + str(version))

def _ninja_toolchains(version, register_toolchains):
if "1.13.1" == version:
maybe(
http_archive,
name = "ninja_1.13.1_linux",
urls = [
"https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-linux.zip",
],
sha256 = "0830252db77884957a1a4b87b05a1e2d9b5f658b8367f82999a941884cbe0238",
strip_prefix = "",
build_file_content = _NINJA_BUILD_FILE.format(
bin = "ninja",
env = "{\"NINJA\": \"$(execpath :ninja_bin)\"}",
),
)

maybe(
http_archive,
name = "ninja_1.13.1_linux-aarch64",
urls = [
"https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-linux-aarch64.zip",
],
sha256 = "740f1b9f9d8ae68438240a6a2f3f7a27fc8b1946d2024a6a6b25857ee877987b",
strip_prefix = "",
build_file_content = _NINJA_BUILD_FILE.format(
bin = "ninja",
env = "{\"NINJA\": \"$(execpath :ninja_bin)\"}",
),
)

maybe(
http_archive,
name = "ninja_1.13.1_mac",
urls = [
"https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-mac.zip",
],
sha256 = "da7797794153629aca5570ef7c813342d0be214ba84632af886856e8f0063dd9",
strip_prefix = "",
build_file_content = _NINJA_BUILD_FILE.format(
bin = "ninja",
env = "{\"NINJA\": \"$(execpath :ninja_bin)\"}",
),
)

maybe(
http_archive,
name = "ninja_1.13.1_mac_aarch64",
urls = [
"https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-mac.zip",
],
sha256 = "da7797794153629aca5570ef7c813342d0be214ba84632af886856e8f0063dd9",
strip_prefix = "",
build_file_content = _NINJA_BUILD_FILE.format(
bin = "ninja",
env = "{\"NINJA\": \"$(execpath :ninja_bin)\"}",
),
)

maybe(
http_archive,
name = "ninja_1.13.1_win",
urls = [
"https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-win.zip",
],
sha256 = "26a40fa8595694dec2fad4911e62d29e10525d2133c9a4230b66397774ae25bf",
strip_prefix = "",
build_file_content = _NINJA_BUILD_FILE.format(
bin = "ninja.exe",
env = "{\"NINJA\": \"$(execpath :ninja_bin)\"}",
),
)

# buildifier: leave-alone
maybe(
prebuilt_toolchains_repository,
name = "ninja_1.13.1_toolchains",
repos = {
"ninja_1.13.1_linux": [
"@platforms//cpu:x86_64",
"@platforms//os:linux",
],
"ninja_1.13.1_linux-aarch64": [
"@platforms//cpu:aarch64",
"@platforms//os:linux",
],
"ninja_1.13.1_mac": [
"@platforms//cpu:x86_64",
"@platforms//os:macos",
],
"ninja_1.13.1_mac_aarch64": [
"@platforms//cpu:aarch64",
"@platforms//os:macos",
],
"ninja_1.13.1_win": [
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
},
tool = "ninja",
)

if register_toolchains:
native.register_toolchains(
"@ninja_1.13.1_toolchains//:ninja_1.13.1_linux_toolchain",
"@ninja_1.13.1_toolchains//:ninja_1.13.1_linux-aarch64_toolchain",
"@ninja_1.13.1_toolchains//:ninja_1.13.1_mac_toolchain",
"@ninja_1.13.1_toolchains//:ninja_1.13.1_mac_aarch64_toolchain",
"@ninja_1.13.1_toolchains//:ninja_1.13.1_win_toolchain",
)

return

if "1.13.0" == version:
maybe(
http_archive,
Expand Down
1 change: 1 addition & 0 deletions toolchains/prebuilt_toolchains.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
}

NINJA_VERSIONS = (
"1.13.1",
"1.13.0",
"1.12.1",
"1.12.0",
Expand Down