From ec55dc15d3a39e5f1a58bfd79148729f38f6acb4 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Mon, 5 Mar 2018 02:24:32 -0500 Subject: [PATCH] Update tools. Also remove the -Wtautological-constant-compare logic. I believe Clang has since removed that problematic warning from -Wall and that check was causing problems when we were embedded as a subproject in a project that didn't set CMP0025. (In that case, by the time our build file ran, the compiler had already been detected and the damage done. This unfortunately means the next Clang version check will hit the same issue, but let's deal with that when we get there.) Change-Id: Iea5f262899b74c5b84f707f4cf4ac4b3540c4acb Reviewed-on: https://boringssl-review.googlesource.com/26375 Reviewed-by: Steven Valdez Commit-Queue: David Benjamin CQ-Verified: CQ bot account: commit-bot@chromium.org --- CMakeLists.txt | 12 ------------ util/bot/DEPS | 4 ++-- util/bot/go/bootstrap.py | 2 +- util/bot/update_clang.py | 4 ++-- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46a8465a..c4965280 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,18 +70,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wno-free-nonheap-object") endif() - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND - NOT "6.0.0" VERSION_GREATER CMAKE_C_COMPILER_VERSION) - # Clang's -Wtautological-constant-compare is far too aggressive and does not - # account for, say, wanting the same code to work on both 32-bit and 64-bit - # platforms. - # - # Note "Clang" and "AppleClang" version differently, so we check for an - # exact match on the COMPILER_ID. As of writing, the warning is not in any - # release of AppleClang yet. - set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wno-tautological-constant-compare -Wtautological-constant-out-of-range-compare") - endif() - if(CLANG OR NOT "7.0.0" VERSION_GREATER CMAKE_C_COMPILER_VERSION) set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wimplicit-fallthrough") endif() diff --git a/util/bot/DEPS b/util/bot/DEPS index 1975de18..9930c80d 100644 --- a/util/bot/DEPS +++ b/util/bot/DEPS @@ -22,12 +22,12 @@ vars = { deps = { 'boringssl/util/bot/android_ndk': { - 'url': Var('chromium_git') + '/android_ndk.git' + '@' + 'e951c37287c7d8cd915bf8d4149fd4a06d808b55', + 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '635bc380968a76f6948fee65f80a0b28db53ae81', 'condition': 'checkout_android', }, 'boringssl/util/bot/android_tools': { - 'url': Var('chromium_git') + '/android_tools.git' + '@' + 'c9f9bbf0a6c862fbef6115e80e8617093cd58e6b', + 'url': Var('chromium_git') + '/android_tools.git' + '@' + '9a70d48fcdd68cd0e7e968f342bd767ee6323bd1', 'condition': 'checkout_android', }, diff --git a/util/bot/go/bootstrap.py b/util/bot/go/bootstrap.py index ec5aa3e9..617637db 100755 --- a/util/bot/go/bootstrap.py +++ b/util/bot/go/bootstrap.py @@ -45,7 +45,7 @@ WORKSPACE = os.path.join(ROOT, 'go') EXE_SFX = '.exe' if sys.platform == 'win32' else '' # Pinned version of Go toolset to download. -TOOLSET_VERSION = 'go1.9.2' +TOOLSET_VERSION = 'go1.10' # Platform dependent portion of a download URL. See http://golang.org/dl/. TOOLSET_VARIANTS = { diff --git a/util/bot/update_clang.py b/util/bot/update_clang.py index dceb585b..5daef343 100644 --- a/util/bot/update_clang.py +++ b/util/bot/update_clang.py @@ -19,8 +19,8 @@ import urllib2 # CLANG_REVISION and CLANG_SUB_REVISION determine the build of clang # to use. These should be synced with tools/clang/scripts/update.py in # Chromium. -CLANG_REVISION = '321529' -CLANG_SUB_REVISION=2 +CLANG_REVISION = '325667' +CLANG_SUB_REVISION=1 PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION)