diff options
| author | David Benjamin <davidben@google.com> | 2023-01-25 17:14:35 -0500 |
|---|---|---|
| committer | Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-01-26 23:11:46 +0000 |
| commit | c371b8b3d3bbb8af29cab8a829339a9c51897edd (patch) | |
| tree | 909b367c99a4464304a01d2f5cfb23f3ff1b6fdd /CMakeLists.txt | |
| parent | 1967621cc9498a4d775a8a9eaabbcb7a52be8316 (diff) | |
| download | boringssl-c371b8b3d3bbb8af29cab8a829339a9c51897edd.zip boringssl-c371b8b3d3bbb8af29cab8a829339a9c51897edd.tar.gz boringssl-c371b8b3d3bbb8af29cab8a829339a9c51897edd.tar.bz2 | |
Set C11 in all compilers.
I'm not sure why I conditioned C11 on non-Clang MSVC. I think I meant to
invert that condition to NOT MSVC OR CLANG. But given that it worked,
just do it across the board.
(Though we support VS2017, which doesn't support a C11 mode, so this is
slightly curious. It may just be that pre-VS2019, this option is a
no-op.)
Change-Id: I271ffd2a913c1aa676fea7ec41f30c1896bb5955
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/56325
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c39d12..6085713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,10 +125,8 @@ endif() set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if(MSVC AND NOT CLANG) - set(CMAKE_C_STANDARD 11) - set(CMAKE_C_STANDARD_REQUIRED ON) -endif() +set(CMAKE_C_STANDARD 11) +set(CMAKE_C_STANDARD_REQUIRED ON) if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration |