dolysis
/
benchmark
mirror of https://github.com/google/benchmark.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Travis-ci: fix clang+libc++ build (#783) 

It broke because the libc++ is being built as part of *this*
build, with old gcc+libstdc++ (4.8?), but LLVM is preparing
to switch to C++14, and gcc+libstdc++ <5 are soft-deprecated.

Just the gcc update doesn't cut it, clang still uses old libstdc++.
This commit is contained in:
Roman Lebedev 2019-03-17 18:48:35 +03:00 committed by GitHub
parent f6e96861a3
commit 5acb0f05ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -42,54 +42,64 @@ matrix:
env: COMPILER=clang++ C_COMPILER=clang BUILD_TYPE=Release env: COMPILER=clang++ C_COMPILER=clang BUILD_TYPE=Release
# Clang w/ libc++ # Clang w/ libc++
- compiler: clang - compiler: clang
dist: xenial
addons: addons:
apt: apt:
packages: packages:
clang-3.8 clang-3.8
env: env:
- INSTALL_GCC6_FROM_PPA=1
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug
- LIBCXX_BUILD=1 - LIBCXX_BUILD=1
- EXTRA_FLAGS="-stdlib=libc++" - EXTRA_FLAGS="-stdlib=libc++"
- compiler: clang - compiler: clang
dist: xenial
addons: addons:
apt: apt:
packages: packages:
clang-3.8 clang-3.8
env: env:
- INSTALL_GCC6_FROM_PPA=1
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Release - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Release
- LIBCXX_BUILD=1 - LIBCXX_BUILD=1
- EXTRA_FLAGS="-stdlib=libc++" - EXTRA_FLAGS="-stdlib=libc++"
# Clang w/ 32bit libc++ # Clang w/ 32bit libc++
- compiler: clang - compiler: clang
dist: xenial
addons: addons:
apt: apt:
packages: packages:
- clang-3.8 - clang-3.8
- g++-multilib - g++-multilib
env: env:
- INSTALL_GCC6_FROM_PPA=1
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug
- LIBCXX_BUILD=1 - LIBCXX_BUILD=1
- BUILD_32_BITS=ON - BUILD_32_BITS=ON
- EXTRA_FLAGS="-stdlib=libc++ -m32" - EXTRA_FLAGS="-stdlib=libc++ -m32"
# Clang w/ 32bit libc++ # Clang w/ 32bit libc++
- compiler: clang - compiler: clang
dist: xenial
addons: addons:
apt: apt:
packages: packages:
- clang-3.8 - clang-3.8
- g++-multilib - g++-multilib
env: env:
- INSTALL_GCC6_FROM_PPA=1
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Release - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Release
- LIBCXX_BUILD=1 - LIBCXX_BUILD=1
- BUILD_32_BITS=ON - BUILD_32_BITS=ON
- EXTRA_FLAGS="-stdlib=libc++ -m32" - EXTRA_FLAGS="-stdlib=libc++ -m32"
# Clang w/ libc++, ASAN, UBSAN # Clang w/ libc++, ASAN, UBSAN
- compiler: clang - compiler: clang
dist: xenial
addons: addons:
apt: apt:
packages: packages:
clang-3.8 clang-3.8
env: env:
- INSTALL_GCC6_FROM_PPA=1
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug
- LIBCXX_BUILD=1 LIBCXX_SANITIZER="Undefined;Address" - LIBCXX_BUILD=1 LIBCXX_SANITIZER="Undefined;Address"
- ENABLE_SANITIZER=1 - ENABLE_SANITIZER=1
@ -97,22 +107,26 @@ matrix:
- UBSAN_OPTIONS=print_stacktrace=1 - UBSAN_OPTIONS=print_stacktrace=1
# Clang w/ libc++ and MSAN # Clang w/ libc++ and MSAN
- compiler: clang - compiler: clang
dist: xenial
addons: addons:
apt: apt:
packages: packages:
clang-3.8 clang-3.8
env: env:
- INSTALL_GCC6_FROM_PPA=1
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug
- LIBCXX_BUILD=1 LIBCXX_SANITIZER=MemoryWithOrigins - LIBCXX_BUILD=1 LIBCXX_SANITIZER=MemoryWithOrigins
- ENABLE_SANITIZER=1 - ENABLE_SANITIZER=1
- EXTRA_FLAGS="-stdlib=libc++ -g -O2 -fno-omit-frame-pointer -fsanitize=memory -fsanitize-memory-track-origins" - EXTRA_FLAGS="-stdlib=libc++ -g -O2 -fno-omit-frame-pointer -fsanitize=memory -fsanitize-memory-track-origins"
# Clang w/ libc++ and MSAN # Clang w/ libc++ and MSAN
- compiler: clang - compiler: clang
dist: xenial
addons: addons:
apt: apt:
packages: packages:
clang-3.8 clang-3.8
env: env:
- INSTALL_GCC6_FROM_PPA=1
- COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=RelWithDebInfo - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=RelWithDebInfo
- LIBCXX_BUILD=1 LIBCXX_SANITIZER=Thread - LIBCXX_BUILD=1 LIBCXX_SANITIZER=Thread
- ENABLE_SANITIZER=1 - ENABLE_SANITIZER=1