Skip to content

Commit 8ae233b

Browse files
fix cef main loop blocking call & github workflow ccache issue (#674)
* bump obs-browser (fix cef main loop blocking call) * cmake: Remove Ccache option to enforce second preprocessor call Feature was removed in Ccache 4.12, which is provided by Homebrew by default since 2025-10-19. * ci: Limit use of Ccache option to enforce second preprocessor call Feature was removed in Ccache 4.12, which is provided by Homebrew by default since 2025-10-19. --------- Co-authored-by: PatTheMav <PatTheMav@users.noreply.github.com>
1 parent a9d81e1 commit 8ae233b

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.github/scripts/utils.zsh/setup_ccache

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
autoload -Uz log_debug log_warning
1+
autoload -Uz is-at-least log_debug log_warning
22

33
if (( ${+commands[ccache]} )) {
44
log_debug "Found ccache at ${commands[ccache]}"
55

6-
ccache --set-config=run_second_cpp=true
6+
local ccache_version=$(ccache --version | head -1 | cut -d ' ' -f 3)
7+
if ! is-at-least 4.12 ${ccache_version}; then
8+
ccache --set-config=run_second_cpp=true
9+
fi
10+
711
ccache --set-config=direct_mode=true
812
ccache --set-config=inode_cache=true
913
ccache --set-config=compiler_check=content

cmake/macos/resources/ccache-launcher-c.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ if [[ "$1" == "${CMAKE_C_COMPILER}" ]] ; then
44
shift
55
fi
66

7-
export CCACHE_CPP2=true
87
export CCACHE_DEPEND=true
98
export CCACHE_DIRECT=true
109
export CCACHE_FILECLONE=true

cmake/macos/resources/ccache-launcher-cxx.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ if [[ "$1" == "${CMAKE_CXX_COMPILER}" ]] ; then
44
shift
55
fi
66

7-
export CCACHE_CPP2=true
87
export CCACHE_DEPEND=true
98
export CCACHE_DIRECT=true
109
export CCACHE_FILECLONE=true

0 commit comments

Comments
 (0)