Skip to content

Commit

Permalink
Re-enable ccache for binaryen build (pyodide#1214)
Browse files Browse the repository at this point in the history
Binaryen now invokes cc instead of gcc, and the cc symlink isn't in
/usr/lib/ccache. This replaces the implementation in pyodide#1014.

This has the disadvantage that build is now broken if ccache is not
available.
  • Loading branch information
dalcde authored Feb 8, 2021
1 parent 7268e45 commit 56073be
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions emsdk/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
PYODIDE_ROOT=$(abspath ..)
include ../Makefile.envs

export PATH := /usr/lib/ccache:$(PATH)

all: emsdk/.complete

emsdk/.complete: ../Makefile.envs $(wildcard patches/*.patch)
Expand All @@ -12,7 +10,7 @@ emsdk/.complete: ../Makefile.envs $(wildcard patches/*.patch)
git clone -b $(BINARYEN_VERSION) --depth 1 https://github.com/WebAssembly/binaryen.git emsdk/binaryen
cat patches/*.patch | patch -p1
cd emsdk && ./emsdk activate --embedded --build=Release $(EMSCRIPTEN_VERSION)
cmake -S emsdk/binaryen -B emsdk/binaryen -DBUILD_STATIC_LIB=ON
cmake -S emsdk/binaryen -B emsdk/binaryen -DBUILD_STATIC_LIB=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
make -C emsdk/binaryen -j5 wasm-opt
cp emsdk/binaryen/bin/wasm-opt emsdk/upstream/bin/
touch emsdk/.complete
Expand Down

0 comments on commit 56073be

Please sign in to comment.