Skip to content

Commit c651636

Browse files
authored
Fix Windows boringssl build by disabling warning 4191. (#956)
* Try disabling warning 4191. * Add additional warning to ignore to boringssl build. * Fix patch to work cross-platform with Git.
1 parent 6985af9 commit c651636

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

cmake/external/boringssl.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if(TARGET boringssl OR NOT DOWNLOAD_BORINGSSL)
1919
endif()
2020

2121
set(patch_file
22-
${CMAKE_CURRENT_LIST_DIR}/../../scripts/git/patches/boringssl/0001-disable-C4255-converting-empty-params-to-void.patch)
22+
${CMAKE_CURRENT_LIST_DIR}/../../scripts/git/patches/boringssl/0001-disable-warnings.patch)
2323

2424
set(boringssl_commit_tag 83da28a68f32023fd3b95a8ae94991a07b1f6c62)
2525

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
1-
From 831806231dd360278dac2a37e3c3158420ad7bb3 Mon Sep 17 00:00:00 2001
2-
From: "google.com" <google.com>
3-
Date: Mon, 7 Jun 2021 13:57:27 -0400
4-
Subject: [PATCH] disable C4255 converting () to (void)
5-
6-
---
7-
src/CMakeLists.txt | 2 ++
8-
1 file changed, 2 insertions(+)
9-
10-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
11-
index b7f468fe6..48f61bfd8 100644
121
--- a/src/CMakeLists.txt
132
+++ b/src/CMakeLists.txt
14-
@@ -193,6 +193,8 @@ elseif(MSVC)
3+
@@ -193,6 +193,10 @@ elseif(MSVC)
154
# possible loss of data
165
"C4244" # 'function' : conversion from 'int' to 'uint8_t',
176
# possible loss of data
187
+ "C4255" # 'function' : no function prototype given: converting '()' to
198
+ # '(void)'
9+
+ "C4191" # 'operator/operation' : unsafe conversion from 'type of
10+
+ # expression' to 'type required'
2011
"C4267" # conversion from 'size_t' to 'int', possible loss of data
2112
"C4371" # layout of class may have changed from a previous version of the
2213
# compiler due to better packing of member '...'
23-
--
24-
2.32.0.rc1.229.g3e70b5a671-goog
25-

0 commit comments

Comments
 (0)