Skip to content

Commit bd0c4cc

Browse files
committed
use libstdc++ 4.8, which avoids the need for a special ppa
1 parent ba9c551 commit bd0c4cc

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
sudo: false
2+
dist: trusty
23
language: cpp
34
python:
45
- "2.7"
@@ -8,26 +9,22 @@ matrix:
89

910
- env: CC_COMPILER="./test/wasm-install/wasm-install/bin/clang" CXX_COMPILER="./test/wasm-install/wasm-install/bin/clang++"
1011
compiler: clang
11-
addons: &gcc5
12+
addons: &stuff
1213
apt:
1314
sources: ['ubuntu-toolchain-r-test']
14-
packages: ['cmake', 'nodejs', 'g++-5']
15+
packages: ['cmake', 'nodejs', 'libstdc++-4.8-dev']
1516

1617
- env: CC_COMPILER="./test/wasm-install/wasm-install/bin/clang" CXX_COMPILER="./test/wasm-install/wasm-install/bin/clang++" COMPILER_FLAGS="-fsanitize=undefined -fno-sanitize-recover=all -fsanitize-blacklist=`pwd`/ubsan.blacklist"
1718
compiler: clang
18-
addons: *gcc5
19+
addons: *stuff
1920

2021
- env: CC_COMPILER="./test/wasm-install/wasm-install/bin/clang" CXX_COMPILER="./test/wasm-install/wasm-install/bin/clang++" COMPILER_FLAGS="-fsanitize=address"
2122
compiler: clang
22-
addons: *gcc5
23+
addons: *stuff
2324

2425
- env: CC_COMPILER="./test/wasm-install/wasm-install/bin/clang" CXX_COMPILER="./test/wasm-install/wasm-install/bin/clang++" COMPILER_FLAGS="-fsanitize=thread"
2526
compiler: clang
26-
addons: *gcc5
27-
28-
- env: CC_COMPILER="gcc-5" CXX_COMPILER="g++-5"
29-
compiler: gcc
30-
addons: *gcc5
27+
addons: *stuff
3128

3229
before_install:
3330
- export CC="${CC_COMPILER}"

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ ELSE()
6363
ADD_COMPILE_FLAG("-Werror")
6464
ADD_COMPILE_FLAG("-Wextra")
6565
ADD_COMPILE_FLAG("-Wno-unused-parameter")
66+
ADD_COMPILE_FLAG("-Wno-mismatched-tags") # libstdc++4.8 issue on trusty
6667
ADD_COMPILE_FLAG("-fno-omit-frame-pointer")
6768
ADD_COMPILE_FLAG("-fPIC")
6869
IF(uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG")

0 commit comments

Comments
 (0)