kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update tools.

Browse Source 
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 <svaldez@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2018-03-05 02:24:32 -05:00 committed by CQ bot account: commit-bot@chromium.org
parent 929a9d7d42
commit ec55dc15d3
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -70,18 +70,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wno-free-nonheap-object") set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wno-free-nonheap-object")
endif() 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) if(CLANG OR NOT "7.0.0" VERSION_GREATER CMAKE_C_COMPILER_VERSION)
set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wimplicit-fallthrough") set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wimplicit-fallthrough")
endif() endif()

4
util/bot/DEPS
View File

@ -22,12 +22,12 @@ vars = {
deps = { deps = {
'boringssl/util/bot/android_ndk': { 'boringssl/util/bot/android_ndk': {
'url': Var('chromium_git') + '/android_ndk.git' + '@' + 'e951c37287c7d8cd915bf8d4149fd4a06d808b55', 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '635bc380968a76f6948fee65f80a0b28db53ae81',
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
'boringssl/util/bot/android_tools': { 'boringssl/util/bot/android_tools': {
'url': Var('chromium_git') + '/android_tools.git' + '@' + 'c9f9bbf0a6c862fbef6115e80e8617093cd58e6b', 'url': Var('chromium_git') + '/android_tools.git' + '@' + '9a70d48fcdd68cd0e7e968f342bd767ee6323bd1',
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },

2
util/bot/go/bootstrap.py
View File

@ -45,7 +45,7 @@ WORKSPACE = os.path.join(ROOT, 'go')
EXE_SFX = '.exe' if sys.platform == 'win32' else '' EXE_SFX = '.exe' if sys.platform == 'win32' else ''
# Pinned version of Go toolset to download. # 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/. # Platform dependent portion of a download URL. See http://golang.org/dl/.
TOOLSET_VARIANTS = { TOOLSET_VARIANTS = {

4
util/bot/update_clang.py
View File

@ -19,8 +19,8 @@ import urllib2
# CLANG_REVISION and CLANG_SUB_REVISION determine the build of clang # CLANG_REVISION and CLANG_SUB_REVISION determine the build of clang
# to use. These should be synced with tools/clang/scripts/update.py in # to use. These should be synced with tools/clang/scripts/update.py in
# Chromium. # Chromium.
CLANG_REVISION = '321529' CLANG_REVISION = '325667'
CLANG_SUB_REVISION=2 CLANG_SUB_REVISION=1
PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION) PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION)