summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2015-09-19 23:22:38 +0100
committerChris Wilson <chris+github@qwirx.com>2015-09-20 14:33:31 +0100
commit2f22d080a34229a4d039fb09fd7c52ad75969c35 (patch)
treef6d2cdbd3bf9acb9454ca017a2438df85f29c5b2
parent58e7740541f5fa507f0e5891ae70f9b7a09d0486 (diff)
Move ccache status commands into before_script and script.
Don't force use of clang even on gcc builds. Print CXX values that will be used during Make. Dummy commit to make Travis rebuild the Pull Request.
-rw-r--r--.travis.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 3ebfb290..a2c4c9b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,15 +24,14 @@ addons:
- xsltproc
- zlib1g-dev
-before_cache: ccache -s
-
before_script:
+ - ccache -s
- ./bootstrap
- - ./configure CC='ccache clang -Qunused-arguments -fcolor-diagnostics' CXX='ccache clang -Qunused-arguments -fcolor-diagnostics'
+ - ./configure CC="ccache $CC" CXX="ccache $CXX"
+ - grep CXX config.status
- make
script:
- ./runtest.pl ALL debug
- ./runtest.pl ALL release
-
-after_cache: ccache -s
+ - ccache -s