forked from f0rmiga/gcc-toolchain
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathcom_google_protobuf.bzlmod.patch
More file actions
71 lines (67 loc) · 2.91 KB
/
Copy pathcom_google_protobuf.bzlmod.patch
File metadata and controls
71 lines (67 loc) · 2.91 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
diff --git a/BUILD.bazel b/BUILD.bazel
index 32b26cbdc..3b6026976 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,6 +1,6 @@
# Bazel (https://bazel.build/) BUILD file for Protobuf.
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
+load("@gcc_toolchain//rules_cc:defs.bzl", "cc_binary", "cc_library")
load("@rules_license//rules:license.bzl", "license")
load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
load("//bazel:cc_proto_library.bzl", "cc_proto_library")
diff --git a/MODULE.bazel b/MODULE.bazel
index cbe66f826..31fd30b9d 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -180,3 +180,15 @@ bazel_dep(
version = "4.0.0",
dev_dependency = True,
)
+
+# We load gcc_toolchain by the same name as we declare it in module().
+# Then, we use use_repo to bring the @gcc_toolchain_<arch> repositories into scope
+# so that we can reference them later when depending in libstdcxx
+bazel_dep(
+ name = "gcc_toolchain",
+ version = "0.0.0",
+)
+gcc_toolchains = use_extension("@gcc_toolchain//toolchain:module_extensions.bzl", "gcc_toolchains")
+use_repo(gcc_toolchains, "gcc_toolchain_aarch64")
+use_repo(gcc_toolchains, "gcc_toolchain_armv7")
+use_repo(gcc_toolchains, "gcc_toolchain_x86_64")
diff --git a/conformance/BUILD.bazel b/conformance/BUILD.bazel
index 9d7938d75..e8db19453 100644
--- a/conformance/BUILD.bazel
+++ b/conformance/BUILD.bazel
@@ -1,6 +1,7 @@
# Conformance testing for Protobuf.
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "objc_library")
+load("@rules_cc//cc:defs.bzl", "objc_library")
+load("@gcc_toolchain//rules_cc:defs.bzl", "cc_binary", "cc_library")
load(
"@rules_pkg//pkg:mappings.bzl",
"pkg_filegroup",
diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
index 4b701c403..3f0c9acb7 100644
--- a/examples/BUILD.bazel
+++ b/examples/BUILD.bazel
@@ -9,7 +9,7 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto
load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
-load("@rules_cc//cc:defs.bzl", "cc_binary")
+load("@gcc_toolchain//rules_cc:defs.bzl", "cc_binary")
load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
load("@rules_python//python:py_binary.bzl", "py_binary")
diff --git a/src/google/protobuf/compiler/BUILD.bazel b/src/google/protobuf/compiler/BUILD.bazel
index 5012ee793..cac054e7b 100644
--- a/src/google/protobuf/compiler/BUILD.bazel
+++ b/src/google/protobuf/compiler/BUILD.bazel
@@ -2,7 +2,7 @@
# Protocol Buffers Compiler
################################################################################
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
+load("@gcc_toolchain//rules_cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
load(
"@rules_pkg//pkg:mappings.bzl",
"pkg_attributes",