From 302941eec2b978ca04ca3dd163bdaa2266013d2f Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sat, 21 Jul 2018 18:55:56 -0400 Subject: [PATCH] build: require clang >= 3.6 Change-Id: I609c6ae59ce78db79bb686d2a53e9f1f26dcaaef --- .travis.yml | 20 +++++++------------- .waf-tools/default-compiler-flags.py | 4 ++-- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 984e8ac..2ac52ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,6 @@ matrix: # Linux/clang # https://apt.llvm.org/ - - os: linux - env: COMPILER=clang++-3.5 - os: linux env: COMPILER=clang++-3.6 - os: linux @@ -45,26 +43,22 @@ matrix: - os: osx osx_image: xcode7.3 env: OSX_VERSION=10.11 + - os: osx + osx_image: xcode8 + env: OSX_VERSION=10.11 - os: osx osx_image: xcode8.3 env: OSX_VERSION=10.12 - os: osx - osx_image: xcode9.3 + osx_image: xcode9.2 + env: OSX_VERSION=10.12 + - os: osx + osx_image: xcode9.4 env: OSX_VERSION=10.13 allow_failures: - - env: COMPILER=g++-6 - - env: COMPILER=g++-7 - - env: COMPILER=g++-8 - - env: COMPILER=clang++-3.5 - env: COMPILER=clang++-3.6 - env: COMPILER=clang++-3.7 DISABLE_ASAN=yes - - env: COMPILER=clang++-3.8 - - env: COMPILER=clang++-3.9 - - env: COMPILER=clang++-4.0 - - env: COMPILER=clang++-5.0 - - env: COMPILER=clang++-6.0 - - env: COMPILER=clang++-7 fast_finish: true diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py index e690290..2be9d90 100644 --- a/.waf-tools/default-compiler-flags.py +++ b/.waf-tools/default-compiler-flags.py @@ -20,9 +20,9 @@ def configure(conf): 'The minimum supported gcc version is 5.3.0.') conf.flags = GccFlags() elif cxx == 'clang': - if ccver < (3, 5, 0): + if ccver < (3, 6, 0): errmsg = ('The version of clang you are using is too old.\n' - 'The minimum supported clang version is 3.5.0.') + 'The minimum supported clang version is 3.6.0.') conf.flags = ClangFlags() else: warnmsg = 'Note: %s compiler is unsupported' % cxx