Skip to content

Commit

Permalink
tools: Remove deprecated version support 2020-07-01
Browse files Browse the repository at this point in the history
  • Loading branch information
jwnimmer-tri committed Jul 1, 2020
1 parent b0b9d73 commit 81026ab
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -111,7 +111,7 @@ endif()
# TODO(jwnimmer-tri) On 2020-07-01 update GCC min to 7.5 here and in the bzl.
set(MINIMUM_APPLE_CLANG_VERSION 11)
set(MINIMUM_CLANG_VERSION 6)
set(MINIMUM_GNU_VERSION 7.4)
set(MINIMUM_GNU_VERSION 7.5)

if(CMAKE_C_COMPILER_ID STREQUAL AppleClang)
if(CMAKE_C_COMPILER_VERSION VERSION_LESS ${MINIMUM_APPLE_CLANG_VERSION})
Expand Down
3 changes: 0 additions & 3 deletions setup/mac/source_distribution/install_prereqs.sh
Expand Up @@ -19,9 +19,6 @@ fi

/usr/local/bin/brew update

# TODO(jamiesnape): Remove the below line on or after 2020-07-01.
/usr/local/bin/brew cask uninstall font-dejavu-sans 2>/dev/null || true

# TODO(jamiesnape): Remove the lines uninstalling llvm@6 and llvm@9 on or after
# 2020-08-01.
if [[ -z "$(/usr/local/bin/brew uses --include-optional --installed llvm@6)" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions tools/workspace/cc/repository.bzl
Expand Up @@ -135,8 +135,8 @@ def _impl(repository_ctx):

elif compiler_id == "GNU":
if compiler_version_major < 7 or (compiler_version_major == 7 and
compiler_version_minor < 4):
fail("GNU compiler version {}.{} is less than 7.4.".format(
compiler_version_minor < 5):
fail("GNU compiler version {}.{} is less than 7.5.".format(
compiler_version_major,
compiler_version_minor,
))
Expand Down

0 comments on commit 81026ab

Please sign in to comment.