Skip to content

Commit 235ee97

Browse files
davidbenBoringssl LUCI CQ
authored and
Boringssl LUCI CQ
committed
Reland "Build with C11 on MSVC in the standalone Bazel build"
This reverts 1e2f169. Bazel 6.3 has since been released, which includes a fix for bazelbuild/bazel#15073. Envoy and gRPC have both since updated to this Bazel version. The policies in https://opensource.google/documentation/policies/cplusplus-support#build_systems also imply a minimum Bazel version of 6.3.2. I'm thinking we let this bake for a little while, to catch any unexpected issues, and then, if it sticks, we try to go ahead and require C11 across the board. Update-Note: If using Bazel with MSVC, and the build fails with something like "Command line error D8016 : '/std:c++20' and '/std:c11' command-line options are incompatible", you are likely running into the above Bazel bug. Update to Bazel 6.3 or later. Bug: 623, 624 Change-Id: I8baa99392ca47bc7580bc2930e7f4b16beced91e Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/62905 Auto-Submit: David Benjamin <[email protected]> Reviewed-by: Adam Langley <[email protected]> Commit-Queue: Adam Langley <[email protected]>
1 parent 5a3eb9e commit 235ee97

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

util/BUILD.toplevel

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,7 @@ boringssl_copts = [
121121
}) + asm_copts
122122

123123
boringssl_copts_c11 = boringssl_copts + select({
124-
# TODO(crbug.com/boringssl/624): This should pass /std:c11 on MSVC. It was
125-
# reverted due to https://github.com/bazelbuild/bazel/issues/15073. When
126-
# Bazel 6.3.0 is released, restore it and require C11 on MSVC.
127-
"@platforms//os:windows": [],
124+
"@platforms//os:windows": ["/std:c11"],
128125
"//conditions:default": gcc_copts_c11,
129126
})
130127

0 commit comments

Comments
 (0)