Skip to content

Commit acde801

Browse files
committed
Removal of ccache before compiler definition (CMAKE detects ccache for itself).
1 parent 3e21150 commit acde801

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
before_install:
4141
- mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
4242
# env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
43-
env: COMPILER="ccache g++-5"
43+
env: COMPILER="g++-5"
4444

4545
# LOCAL CHANGES: Added 'ant' to the OSX package list (needed by security-scanner regression tests)
4646

@@ -55,7 +55,7 @@ jobs:
5555
- mkdir bin ; ln -s /usr/bin/gcc bin/gcc
5656
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ant
5757
- export PATH=/usr/local/opt/ccache/libexec:$PATH
58-
env: COMPILER="ccache g++"
58+
env: COMPILER="g++"
5959

6060
# OS X using clang++
6161
- stage: Test different OS/CXX/Flags
@@ -67,7 +67,7 @@ jobs:
6767
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ant
6868
- export PATH=/usr/local/opt/ccache/libexec:$PATH
6969
env:
70-
- COMPILER="ccache clang++ -Qunused-arguments -fcolor-diagnostics"
70+
- COMPILER="clang++ -Qunused-arguments -fcolor-diagnostics"
7171
- CCACHE_CPP2=yes
7272

7373
# Ubuntu Linux with glibc using g++-5, debug mode
@@ -88,7 +88,7 @@ jobs:
8888
- mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
8989
# env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
9090
env:
91-
- COMPILER="ccache g++-5"
91+
- COMPILER="g++-5"
9292
- EXTRA_CXXFLAGS="-DDEBUG"
9393
script: echo "Not running any tests for a debug build."
9494

@@ -113,7 +113,7 @@ jobs:
113113
- export CCACHE_CPP2=yes
114114
# env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
115115
env:
116-
- COMPILER="ccache clang++-3.7 -Qunused-arguments -fcolor-diagnostics"
116+
- COMPILER="clang++-3.7 -Qunused-arguments -fcolor-diagnostics"
117117
- CCACHE_CPP2=yes
118118

119119
# Ubuntu Linux with glibc using clang++-3.7, debug mode
@@ -137,7 +137,7 @@ jobs:
137137
- export CCACHE_CPP2=yes
138138
# env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
139139
env:
140-
- COMPILER="ccache clang++-3.7 -Qunused-arguments -fcolor-diagnostics"
140+
- COMPILER="clang++-3.7 -Qunused-arguments -fcolor-diagnostics"
141141
- CCACHE_CPP2=yes
142142
- EXTRA_CXXFLAGS="-DDEBUG"
143143
script: echo "Not running any tests for a debug build."

0 commit comments

Comments
 (0)