SunnyQjm/ndn-tools
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build+ci: sync compilation flags and Travis-CI matrix with ndn-cxx

Browse Source 
Change-Id: If44e87e190fdf74f32adf38546109bfce618c5ea
Refs: #4721
This commit is contained in:
Davide Pesavento committed 2018-09-11 18:14:18 -04:00
1 parent 3f2f48616e
commit 88beb4d0f5
2 files changed
+12 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.travis.yml
+8 -2
View File
@@ -37,6 +37,8 @@ matrix:
env: COMPILER=clang++-6.0
- os: linux
env: COMPILER=clang++-7
- os: linux
env: COMPILER=clang++-8
# macOS/clang
# https://docs.travis-ci.com/user/reference/osx/#OS-X-Version
@@ -55,10 +57,14 @@ matrix:
- os: osx
osx_image: xcode9.4
env: OSX_VERSION=10.13
- os: osx
osx_image: xcode10
env: OSX_VERSION=10.13
allow_failures:
- env: COMPILER=clang++-3.6
- env: COMPILER=clang++-3.7 DISABLE_ASAN=yes
- env: COMPILER=clang++-8
fast_finish: true
@@ -72,8 +78,8 @@ install: |
clang++-*)
CLANG_VERSION=${COMPILER/clang++}
if [[ ${CLANG_VERSION} != "-3."* ]]; then
wget -O - "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add -
travis_retry sudo add-apt-repository -y "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial${CLANG_VERSION/-7} main"
travis_retry wget -nv -O - "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add -
travis_retry sudo add-apt-repository -y "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial${CLANG_VERSION/-8} main"
fi
travis_retry sudo apt-get -qq update
travis_retry sudo apt-get -qy install "clang${CLANG_VERSION}"
.waf-tools/default-compiler-flags.py
+4 -4
View File
@@ -186,15 +186,13 @@ class ClangFlags(GccBasicFlags):
flags['CXXFLAGS'] += ['-fcolor-diagnostics',
'-Wextra-semi',
'-Wundefined-func-template',
'-Wno-error=deprecated-register',
'-Wno-error=infinite-recursion', # Bug #3358
'-Wno-error=keyword-macro', # Bug #3235
'-Wno-error=unneeded-internal-declaration', # Bug #1588
'-Wno-unused-local-typedef', # Bugs #2657 and #3209
]
version = self.getCompilerVersion(conf)
if version < (3, 9, 0) or (Utils.unversioned_sys_platform() == 'darwin' and version < (8, 1, 0)):
flags['CXXFLAGS'] += ['-Wno-unknown-pragmas']
if version < (6, 0, 0):
flags['CXXFLAGS'] += ['-Wno-missing-braces'] # Bug #4721
return flags
def getOptimizedFlags(self, conf):
@@ -207,4 +205,6 @@ class ClangFlags(GccBasicFlags):
version = self.getCompilerVersion(conf)
if version < (3, 9, 0) or (Utils.unversioned_sys_platform() == 'darwin' and version < (8, 1, 0)):
flags['CXXFLAGS'] += ['-Wno-unknown-pragmas']
if version < (6, 0, 0):
flags['CXXFLAGS'] += ['-Wno-missing-braces'] # Bug #4721
return flags