Skip to content

Commit f81ad23

Browse files
committed
Upgraded to 26100 windows sdk, and patched boringssl to include <memory> outside C++, thus preventing clash of clang-20 and sdk about _m_prefetchw
1 parent 63f1847 commit f81ad23

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ build:windows --copt="/Zc:strictStrings" --copt="/Gy"
5050
build:windows --host_copt="/Zc:strictStrings" --copt="/Gy"
5151
build:windows --host_linkopt="shell32.lib"
5252
# Requires Visual Studio 2019 Build Tools installed in default location with the latest compiler (14.29.30133) for x64
53-
build:windows --action_env=BAZEL_VC_FULL_VERSION=14.42.34433 --action_env=BAZEL_WINSDK_FULL_VERSION=10.0.22621.0
54-
build:windows --host_action_env=BAZEL_VC_FULL_VERSION=14.42.34433 --host_action_env=BAZEL_WINSDK_FULL_VERSION=10.0.22621.0
53+
build:windows --action_env=BAZEL_VC_FULL_VERSION=14.42.34433 --action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0
54+
build:windows --host_action_env=BAZEL_VC_FULL_VERSION=14.42.34433 --host_action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0
5555

5656
# Set minimum supported C++ version
5757
build:macos --host_cxxopt=-std=c++17 --cxxopt=-std=c++17

MODULE.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ bazel_dep(name = "abseil-cpp", version = "20250512.1")
88
bazel_dep(name = "aspect_bazel_lib", version = "2.19.4")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "boringssl", version = "0.20250514.0")
11+
single_version_override(
12+
module_name = "boringssl",
13+
patch_strip = 1,
14+
patches = [
15+
"bazel/boringssl.patch",
16+
],
17+
)
1118
bazel_dep(name = "curl", version = "8.8.0.bcr.3")
1219
bazel_dep(name = "depend_on_what_you_use", version = "0.9.0")
1320
bazel_dep(name = "google_benchmark", version = "1.9.4")

bazel/boringssl.patch

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
diff --git a/include/openssl/base.h b/include/openssl/base.h
2+
index 95cc15df1..2d5dbcb02 100644
3+
--- a/include/openssl/base.h
4+
+++ b/include/openssl/base.h
5+
@@ -414,10 +414,10 @@ typedef void *OPENSSL_BLOCK;
6+
7+
#if !defined(BORINGSSL_NO_CXX)
8+
9+
-extern "C++" {
10+
-
11+
#include <memory>
12+
13+
+extern "C++" {
14+
+
15+
// STLPort, used by some Android consumers, not have std::unique_ptr.
16+
#if defined(_STLPORT_VERSION)
17+
#define BORINGSSL_NO_CXX
18+

0 commit comments

Comments
 (0)