Skip to content

Commit fbf6b6d

Browse files
authored
Use config file instead of environment to configure ccache (#25538)
Using a file will make it easier to set configurations from an earlier step to a later one, or to use a different configuration for the main and other branches. Also dump some additional log info after building.
1 parent 7e0584e commit fbf6b6d

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.circleci/ccache.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
debug = true
2+
debug_level = 1

.circleci/config.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,11 @@ commands:
209209
- run:
210210
name: "Ccache stats and configuration"
211211
command: |
212-
ls ~/cache/sysroot/lib/wasm32-emscripten || echo "no build"
212+
ls -l ~/cache/sysroot/lib/wasm32-emscripten || echo "no build"
213+
ls -l ~/cache/sysroot/include/emscripten/heap.h
213214
cat ~/cache/sysroot/lib/wasm32-emscripten/crtbegin.o.ccache-log
214215
date
216+
cat ~/cache/build/libcompiler_rt/absvdi2.o.ccache-log
215217
ccache -s
216218
ccache --print-stats
217219
ccache -p
@@ -574,8 +576,6 @@ jobs:
574576
EMCC_CORES: 16
575577
EMCC_USE_NINJA: 1
576578
EM_COMPILER_WRAPPER: "ccache"
577-
CCACHE_DEBUG: 1
578-
CCACHE_DEBUGLEVEL: 1
579579
steps:
580580
- checkout
581581
- run:
@@ -611,6 +611,12 @@ jobs:
611611
- restore_cache:
612612
name: "Restore Ccache cache"
613613
key: clang-{{ checksum "~/emsdk/clang_version.txt" }}
614+
- run:
615+
name: Configure ccache
616+
command: |
617+
mkdir -p ~/.ccache
618+
cat .circleci/ccache.conf
619+
cp .circleci/ccache.conf ~/.ccache
614620
- build-libs
615621
- run:
616622
name: Clean build directory

0 commit comments

Comments
 (0)