commit 49f0329110a1d93a5febc2bceceedc655d995420
author David Benjamin <davidben@google.com> Mon Mar 22 17:35:06 2021 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Mar 23 17:57:18 2021 +0000
tree b80ebc3fe99661a103ae4285f5b843402f02d0e9
parent d0b66c7d5c82b25933f79a37720708e5a55885e7

Remove GCC 4.8.99 check.

GCC 4.9.0 was released April 2014, which was well over five years ago.

Change-Id: Ib26d459ed82a7af671b8524a334a6f99eacb003e
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/46346
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef162fd..893bca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -261,11 +261,7 @@
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
-  if((CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.8.99") OR CLANG)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-  else()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-  endif()
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
 endif()
 
 # pthread_rwlock_t requires a feature flag.

util/generate_build_files.py

diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index 7341a2f..5ec2d6a 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -442,12 +442,7 @@
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
   endif()
 
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fno-common")
-  if((CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.8.99") OR CLANG)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-  else()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-  endif()
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fno-common -std=c11")
 endif()
 
 # pthread_rwlock_t requires a feature flag.