Skip to content

Commit d58cdf6

Browse files
author
James Sharpe
authored
Upgrade default ninja version to 1.12.1 (#1248)
1 parent 35bf656 commit d58cdf6

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use_repo(
3030
"glib_src",
3131
"gnumake_src",
3232
"meson_src",
33-
"ninja_1.12.0_toolchains",
33+
"ninja_1.12.1_toolchains",
3434
"ninja_build_src",
3535
"pkgconfig_src",
3636
"rules_foreign_cc_framework_toolchains",
@@ -39,7 +39,7 @@ use_repo(
3939
register_toolchains(
4040
"@rules_foreign_cc_framework_toolchains//:all",
4141
"@cmake_3.23.2_toolchains//:all",
42-
"@ninja_1.12.0_toolchains//:all",
42+
"@ninja_1.12.1_toolchains//:all",
4343
"@python_3_9//:all",
4444
"@rules_foreign_cc//toolchains:all",
4545
)

foreign_cc/extensions.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ load("//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
44
load("//toolchains:prebuilt_toolchains.bzl", "prebuilt_toolchains")
55

66
_DEFAULT_CMAKE_VERSION = "3.23.2"
7-
_DEFAULT_NINJA_VERSION = "1.12.0"
7+
_DEFAULT_NINJA_VERSION = "1.12.1"
88

99
cmake_toolchain_version = tag_class(attrs = {
1010
"version": attr.string(doc = "The cmake version", default = _DEFAULT_CMAKE_VERSION),

foreign_cc/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def rules_foreign_cc_dependencies(
1111
register_default_tools = True,
1212
cmake_version = "3.23.2",
1313
make_version = "4.4.1",
14-
ninja_version = "1.12.0",
14+
ninja_version = "1.12.1",
1515
meson_version = "1.1.1",
1616
pkgconfig_version = "0.29.2",
1717
register_preinstalled_tools = True,

toolchains/built_toolchains.bzl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,19 @@ def _ninja_toolchain(version, register_toolchains):
135135
native.register_toolchains(
136136
"@rules_foreign_cc//toolchains:built_ninja_toolchain",
137137
)
138+
if version == "1.12.1":
139+
maybe(
140+
http_archive,
141+
name = "ninja_build_src",
142+
build_file_content = _ALL_CONTENT,
143+
integrity = "sha256-ghvf9Io/aDvEuztvC1/nstZHz2XVKutjMoyRpsbfKFo=",
144+
strip_prefix = "ninja-1.12.1",
145+
urls = [
146+
"https://mirror.bazel.build/github.com/ninja-build/ninja/archive/v1.12.1.tar.gz",
147+
"https://github.com/ninja-build/ninja/archive/v1.12.1.tar.gz",
148+
],
149+
)
150+
return
138151
if version == "1.12.0":
139152
maybe(
140153
http_archive,

0 commit comments

Comments
 (0)