Skip to content

Commit

Permalink
Moves the ccache clang wrapper scripts to utils/travis/.
Browse files Browse the repository at this point in the history
Also clears the ccache statistics after printing them. This means the hit/miss count will be shown per run, rather than cumulatively.
  • Loading branch information
Pentarctagon committed Feb 24, 2018
1 parent 726b1be commit b71f7cd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Expand Up @@ -70,18 +70,19 @@ install:
script:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
if [ "$TOOL" = "xcodebuild" ]; then
cd ./projectfiles/Xcode;

export PATH="/usr/local/opt/ccache/libexec:$PWD/utils/travis:$PATH";
export CC=ccache-clang;
export CXX=ccache-clang++;
export PATH="/usr/local/opt/ccache/libexec:$PWD:$PATH";

cd ./projectfiles/Xcode;

export CCACHE_MAXSIZE=2G;
export CCACHE_COMPILERCHECK=content;

xcodebuild -project Wesnoth.xcodeproj -target Wesnoth;

ccache -s;
ccache -z;
else
ln -s build-cache/ build;
./utils/travis/check_utf8.sh;
Expand Down
2 changes: 2 additions & 0 deletions docker_run.sh
Expand Up @@ -57,6 +57,8 @@ else

# print ccache statistics
ccache -s
# clear ccache statistics, so only per run info is printed rather than cumulative
ccache -z
else
scons wesnoth wesnothd campaignd boost_unit_tests build=release ctool=$CC cxxtool=$CXX --debug=time extra_flags_config="-pipe" extra_flags_release="$EXTRA_FLAGS_RELEASE" strict="$STRICT" cxx_std=$CXXSTD nls=false jobs=2 enable_lto=false
fi
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit b71f7cd

Please sign in to comment.