File tree Expand file tree Collapse file tree 1 file changed +13
-4
lines changed Expand file tree Collapse file tree 1 file changed +13
-4
lines changed Original file line number Diff line number Diff line change 7
7
# to allow C++11, though we are not yet building with -std=c++11
8
8
9
9
install :
10
- - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
10
+ # /usr/bin/gcc is 4.6 always, but gcc-X.Y is available.
11
+ # - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
12
+ - if [ "$CXX" = "g++" ]; then export CXX="g++-4.6" CC="gcc-4.6"; fi
13
+ # /usr/bin/clang is our version already, and clang-X.Y does not exist.
14
+ # - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.3" CC="clang-3.3"; fi
15
+ - echo ${PATH}
16
+ - ls /usr/local
17
+ - export PATH=/usr/bin:${PATH}
18
+ - echo ${CXX}
19
+ - ${CXX} --version
11
20
addons :
12
21
apt :
13
22
sources :
14
23
- ubuntu-toolchain-r-test
15
24
packages :
16
- - gcc-4.8
17
- - g++-4.8
18
- - clang
25
+ - gcc-4.6
26
+ - g++-4.6
27
+ - clang-3.3
19
28
- valgrind
20
29
os :
21
30
- linux
You can’t perform that action at this time.
0 commit comments