@@ -33,17 +33,11 @@ def built_toolchains(cmake_version, make_version, ninja_version, meson_version,
33
33
34
34
Args:
35
35
cmake_version: The CMake version to build
36
-
37
36
make_version: The Make version to build
38
-
39
37
ninja_version: The Ninja version to build
40
-
41
38
meson_version: The Meson version to build
42
-
43
39
pkgconfig_version: The pkg-config version to build
44
-
45
40
register_toolchains: If true, registers the toolchains via native.register_toolchains. Used by bzlmod
46
-
47
41
register_built_pkgconfig_toolchain: If true, the built pkgconfig toolchain will be registered.
48
42
"""
49
43
_cmake_toolchain (cmake_version , register_toolchains )
@@ -73,7 +67,7 @@ def _cmake_toolchain(version, register_toolchains):
73
67
strip_prefix = prefix ,
74
68
urls = urls ,
75
69
patches = [
76
- Label ("//toolchains:cmake-c++11.patch" ),
70
+ Label ("//toolchains/patches :cmake-c++11.patch" ),
77
71
],
78
72
)
79
73
return
@@ -118,7 +112,7 @@ def _make_toolchain(version, register_toolchains):
118
112
http_archive ,
119
113
name = "gnumake_src" ,
120
114
build_file_content = _ALL_CONTENT ,
121
- patches = [Label ("//toolchains:make-reproducible-bootstrap.patch" )],
115
+ patches = [Label ("//toolchains/patches :make-reproducible-bootstrap.patch" )],
122
116
sha256 = "e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19" ,
123
117
strip_prefix = "make-4.3" ,
124
118
urls = [
@@ -340,13 +334,13 @@ cc_import(
340
334
# The patch is required as bazel does not provide the VCINSTALLDIR or WINDOWSSDKDIR vars
341
335
patches = [
342
336
# This patch is required as bazel does not provide the VCINSTALLDIR or WINDOWSSDKDIR vars
343
- Label ("//toolchains:pkgconfig-detectenv.patch" ),
337
+ Label ("//toolchains/patches :pkgconfig-detectenv.patch" ),
344
338
345
339
# This patch is required as rules_foreign_cc runs in MSYS2 on Windows and MSYS2's "mkdir" is used
346
- Label ("//toolchains:pkgconfig-makefile-vc.patch" ),
340
+ Label ("//toolchains/patches :pkgconfig-makefile-vc.patch" ),
347
341
348
342
# This patch fixes explicit integer conversion which causes errors in clang >= 15 and gcc >= 14
349
- Label ("//toolchains:pkgconfig-builtin-glib-int-conversion.patch" ),
343
+ Label ("//toolchains/patches :pkgconfig-builtin-glib-int-conversion.patch" ),
350
344
],
351
345
urls = [
352
346
"https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz" ,
0 commit comments