diff options
author | 2018-08-28 13:58:00 -0700 | |
---|---|---|
committer | 2018-08-28 13:58:00 -0700 | |
commit | 60b6f2df20d490107c17eca1c8a2cccecfd97119 (patch) | |
tree | c10378129f681d544e6cb74c381778a786906f7f /doc/ssl-performance.md | |
parent | d69fdefcfa564ec60dba1d77483d62c8315ae2f3 (diff) | |
parent | ee65a5eaee45a765d1d4176a797bb8288faeb180 (diff) |
Merge branch 'master' into minor-timer-fix
Diffstat (limited to 'doc/ssl-performance.md')
-rw-r--r-- | doc/ssl-performance.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/ssl-performance.md b/doc/ssl-performance.md index 176c8d8f24..711b9dff09 100644 --- a/doc/ssl-performance.md +++ b/doc/ssl-performance.md @@ -14,7 +14,9 @@ Makefile | all other cases | all | :x: Bazel | | Linux | :heavy_check_mark: Bazel | | MacOS | :heavy_check_mark: Bazel | | Windows | :x: -CMake | boringssl from submodule (default) | all | :x: +CMake | boringssl from submodule (default) | Linux or MacOS | :heavy_check_mark: +CMake | boringssl from submodule (default), generator=Ninja | Windows | :heavy_check_mark: +CMake | boringssl from submodule (default), generator=Visual Studio | Windows | :x: CMake | pre-installed OpenSSL 1.0.2+ (`gRPC_SSL_PROVIDER=package`) | all | :heavy_check_mark: ## Other Languages: Binary/Source Packages |