mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-11 02:51:10 +00:00
shadPS4 build: give only shadPS4 the ccache launcher
FEXCore's CMake already wraps its compiles in ccache when it is installed, so the global CMAKE_<LANG>_COMPILER_LAUNCHER doubled it into "ccache sloppiness=time_macros ccache clang" and every compile failed. Pass the launcher to shadPS4's configure alone (patches/0005).
This commit is contained in:
1 parent
fcbbe87dde
commit
24b4abdfd4
2 files changed
+17
-4
No files matched your search
@@ -53,11 +53,11 @@ done
|
||||
# only through it, and without it builds ALSA alone.
|
||||
export PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig
|
||||
pkg-config --modversion libpulse
|
||||
# Every CMake project the build configures (FEXCore, shadPS4 and its externals) compiles through
|
||||
# ccache; the cache lives in the workspace (.ccache) and the workflow keeps it between runs.
|
||||
# FEXCore compiles through ccache on its own once it is installed, and patches/0005 hands
|
||||
# shadPS4's configure the same launcher; the cache lives in the workspace (.ccache) and the
|
||||
# workflow keeps it between runs.
|
||||
export CCACHE_DIR=$WORK/.ccache CCACHE_BASEDIR=$WORK CCACHE_NOHASHDIR=1 \
|
||||
CCACHE_COMPILERCHECK=content CCACHE_MAXSIZE=4G \
|
||||
CMAKE_C_COMPILER_LAUNCHER=ccache CMAKE_CXX_COMPILER_LAUNCHER=ccache
|
||||
CCACHE_COMPILERCHECK=content CCACHE_MAXSIZE=4G
|
||||
ccache -z
|
||||
bash "$SRC/runtime/scripts/build-shadps4-arm64.sh"
|
||||
ccache -s
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/runtime/scripts/build-shadps4-arm64.sh b/runtime/scripts/build-shadps4-arm64.sh
|
||||
index 49c35fa..2bdcba0 100644
|
||||
--- a/runtime/scripts/build-shadps4-arm64.sh
|
||||
+++ b/runtime/scripts/build-shadps4-arm64.sh
|
||||
@@ -74,6 +74,8 @@ cmake -S "$project_root" -B "$build_dir" -G Ninja \
|
||||
-DXEXT_LIB:FILEPATH="$arm64_xext_lib" \
|
||||
-DIMGUI_FONT_EMBED_EXECUTABLE="$host_font_embed" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
+ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
|
||||
+ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
|
||||
-DCMAKE_CXX_SCAN_FOR_MODULES=OFF \
|
||||
-DCMAKE_AR="$llvm_ar" \
|
||||
-DCMAKE_RANLIB="$llvm_ranlib" \
|
||||
Reference in new issue
Block a user