Disable open menu tracking outside of Windows

Tracking whether or not the menus are opened is necessary on Windows since menus stop
the main loop. This is not necessary on other platforms. In particular, on Mac, we do
not get a `wxEVT_MENU_CLOSE` event when opening a dialog from a shortcut, resulting in
the menu status tracking being incorrect.

Fixes #1348

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.1.11] - 2024-09-15 
+
+==========================
+* 3eea90af - build: set BUILD_TESTING=OFF when not git checkout [rkitover]
+* b3952d74 - build: fix ENABLE_LIRC=ON [rkitover]
+* f264e7f8 - Fix Help -> Translations URL [rkitover]
+* 61f427de - Write shortcuts in the proper section (#1335) [Steelskin]
+* d619ee2b - build: fix installing GoogleTest [rkitover]
+* 26207038 - Update WinSparkle to 0.8.1 and add ARM64 [rkitover]
+
 ## [2.1.10] - 2024-09-08 
 
 ==========================

CMakeLists.txt

@@ -83,6 +83,11 @@ include(Options)
 include(Toolchain)
 include(Dependencies)
 
+# Disable tests when not in a git checkout.
+if(NOT EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    set(BUILD_TESTING OFF)
+endif()
+
 # Configure gtest
 if(BUILD_TESTING)
     FetchContent_Declare(googletest
@@ -106,11 +111,6 @@ elseif(NOT CMAKE_BUILD_TYPE MATCHES "^(Release|Debug|RelWithDebInfo|MinSizeRel)$
     message(FATAL_ERROR "Invalid CMAKE_BUILD_TYPE: '${CMAKE_BUILD_TYPE}', must be one of: 'Release', 'Debug', 'RelWithDebInfo' or 'MinSizeRel'")
 endif()
 
-# Link debug libs for RelWithDebInfo
-if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-    set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "Debug")
-endif()
-
 set(MSYS OFF)
 if(NOT "$ENV{MSYSTEM_PREFIX}" STREQUAL "")
     set(MSYS ON)

DEVELOPER-MANUAL.md

@@ -326,10 +326,29 @@ certificate of the type 'Developer ID Application' stored in your login
 keychain.
 
 If you are not using a GUI session, you will need to use a method to unlock your
-login keychain before building. Adding the certificate and key to the System
-keychain is also a method that some people use.
+login keychain before building so that your codesigning certificate can be used.
+Adding the certificate and key to the System keychain is also a method that some
+people use.
 
-Then run:
+To unlock your keychain on login, you can add something like this to your
+`~/.zshrc`:
+
+```bash
+security unlock-keychain -p "$(cat ~/.login-keychain-password)" login.keychain
+```
+, with your login password in that file.
+
+For notarization to work, you will need to create an app-specific password on
+https://appleid.apple.com , get your Team ID from your Apple Developer account,
+and store them with this command:
+
+```bash
+xcrun notarytool store-credentials AC_PASSWORD \
+               --apple-id you@domain.com \
+               --team-id <DeveloperTeamID> \
+               --password <secret_app_specific_2FA_password>
+```
+. Once all of this is set up, run:
 
 ```bash
 tools/osx/builder

cmake/Dependencies.cmake

@@ -23,7 +23,7 @@ if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
         if(VCPKG_TARGET_TRIPLET MATCHES -static)
             set(arch_suffix  -static)
         endif()
-        if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
+        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
             set(path_prefix debug)
         endif()
         set(installed_prefix ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows${arch_suffix}/${path_prefix})

cmake/Options.cmake

@@ -72,13 +72,6 @@ if(TRANSLATIONS_ONLY)
     set(ENABLE_LINK_DEFAULT OFF)
 else()
     find_package(SFML 2.4 COMPONENTS network system)
-    if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-        if(SFML_STATIC_LIBRARIES AND SFML_NETWORK_LIBRARY_STATIC_DEBUG AND SFML_SYSTEM_LIBRARY_STATIC_DEBUG)
-            set(SFML_LIBRARIES ${SFML_NETWORK_LIBRARY_STATIC_DEBUG} ${SFML_SYSTEM_LIBRARY_STATIC_DEBUG})
-        elseif(SFML_NETWORK_LIBRARY_DYNAMIC_DEBUG AND SFML_SYSTEM_LIBRARY_DYNAMIC_DEBUG)
-            set(SFML_LIBRARIES ${SFML_NETWORK_LIBRARY_DYNAMIC_DEBUG} ${SFML_SYSTEM_LIBRARY_DYNAMIC_DEBUG})
-        endif()
-    endif()
     set(ENABLE_LINK_DEFAULT OFF)
     if(SFML_FOUND)
         set(ENABLE_LINK_DEFAULT ON)

cmake/Set-Toolchain-vcpkg.cmake

@@ -10,19 +10,28 @@ if(NOT DEFINED VCPKG_TARGET_TRIPLET)
     # Check if we are in an MSVC environment.
     find_program(cl_exe_path NAME cl.exe HINTS ENV PATH)
 
-    if($ENV{CXX} MATCHES "cl.exe$" OR cl_exe_path)
+    if(ENV{CXX} MATCHES "cl.exe$" OR cl_exe_path)
         # Infer the architecture from the LIB folders.
-        foreach(LIB $ENV{LIB})
-            if(${LIB} MATCHES "x64$")
+        foreach(lib $ENV{LIB})
+            if(lib MATCHES "x64$")
                 set(VBAM_VCPKG_PLATFORM "x64-windows-static")
                 break()
             endif()
-            if(${LIB} MATCHES "x86$")
+            if(lib MATCHES "x86$")
                 set(VBAM_VCPKG_PLATFORM "x86-windows-static")
                 break()
             endif()
-            if(${LIB} MATCHES "ARM64$")
+            if(lib MATCHES "ARM64$")
                 set(VBAM_VCPKG_PLATFORM "arm64-windows-static")
+
+                foreach(path $ENV{PATH})
+                    if(path MATCHES "[Hh]ost[Xx]64")
+                        set(VCPKG_HOST_TRIPLET "x64-windows-static" CACHE STRING "Vcpkg host triplet" FORCE)
+                        set(VCPKG_USE_HOST_TOOLS ON CACHE BOOL "Use vcpkg host tools" FORCE)
+                        break()
+                    endif()
+                endforeach()
+
                 break()
             endif()
         endforeach()
@@ -567,14 +576,4 @@ endfunction()
 
 vcpkg_set_toolchain()
 
-# Make vcpkg use debug libs for RelWithDebInfo
-set(orig_build_type ${CMAKE_BUILD_TYPE})
-
-if(CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
-    set(CMAKE_BUILD_TYPE Debug)
-endif()
-
 include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
-
-set(CMAKE_BUILD_TYPE ${orig_build_type})
-unset(orig_build_type)

cmake/Toolchain-gcc-clang.cmake

@@ -46,7 +46,7 @@ if(NOT ENABLE_ASM) # inline asm is not allowed with -fPIC
 endif()
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    add_compile_options(-ggdb3 -Og -fno-omit-frame-pointer -Wall -Wextra)
+    add_compile_options(-ggdb3 -fno-omit-frame-pointer -Wall -Wextra)
 else()
     add_compile_options(-Ofast -fomit-frame-pointer)
 endif()

cmake/UpdateAppcast.cmake

@@ -16,7 +16,7 @@ Ignore the following cmake error.
     # Get last tag.
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} tag --sort=-v:refname
+        COMMAND git tag --sort=-v:refname
         OUTPUT_VARIABLE git_tags
         OUTPUT_STRIP_TRAILING_WHITESPACE
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -43,7 +43,7 @@ Ignore the following cmake error.
     # Clone repo.
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} clone git@github.com:visualboyadvance-m/visualboyadvance-m.github.io web-data
+        COMMAND git clone git@github.com:visualboyadvance-m/visualboyadvance-m.github.io web-data
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     )
 
@@ -103,21 +103,21 @@ Ignore the following cmake error.
     )
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} add appcast.xml
+        COMMAND git add appcast.xml
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/web-data
     )
 
     # Commit the change.
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} commit -m "release ${new_tag}" --signoff -S
+        COMMAND git commit -m "release ${new_tag}" --signoff -S
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/web-data
     )
 
     # Make release tag.
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} tag -s -m${new_tag} ${new_tag}
+        COMMAND git tag -s -m${new_tag} ${new_tag}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/web-data
     )
 

src/core/gb/gb.cpp

@@ -2969,8 +2969,13 @@ void gbReset()
         inBios = true;
     } else if (gbHardware & 0xa) {
         // Set compatibility mode if it is a DMG ROM.
-        const uint8_t gbcFlag = g_gbCartData.SupportsCGB() ? 0x80 : 0x00;
-        gbMemory[0xff6c] = 0xfe | gbcFlag;
+        if (g_gbCartData.SupportsCGB()) {
+            // OPRI with bit 0 set to 0 = CGB mode.
+            gbMemory[0xff6c] = 0xfe;
+        } else {
+            // OPRI with bit 0 set to 1 = DMG mode.
+            gbMemory[0xff6c] = 0xff;
+        }
     }
 
     gbLine99Ticks = 1;

src/sdl/CMakeLists.txt

@@ -61,7 +61,7 @@ endif()
 
 if(ENABLE_LIRC)
     target_link_libraries(vbam lirc_client)
-    target_compile_definitions(vbam VBAM_ENABLE_LIRC)
+    target_compile_definitions(vbam PUBLIC VBAM_ENABLE_LIRC)
 endif()
 
 if(WIN32)
@@ -71,15 +71,15 @@ endif()
 # Installation scripts.
 install(
     PROGRAMS ${PROJECT_BINARY_DIR}/vbam${CMAKE_EXECUTABLE_SUFFIX}
-    DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 install(
     FILES ${CMAKE_CURRENT_LIST_DIR}/vbam.cfg-example
-    DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}
+    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}
     RENAME vbam.cfg
 )
 
 if(UNIX)
     # man pages.
-    install(FILES ${CMAKE_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man6)
+    install(FILES ${CMAKE_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
 endif()

src/wx/CMakeLists.txt

@@ -141,7 +141,7 @@ endif()
 
 # wxWidgets configuration.
 set(wxWidgets_USE_UNICODE ON)
-if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(wxWidgets_USE_DEBUG ON) # noop if wx is compiled with --disable-debug, like in Mac Homebrew atm
 endif()
 if(VBAM_STATIC)
@@ -162,6 +162,13 @@ if(NOT wxWidgets_FOUND)
     set(ENABLE_OPENGL FALSE)
 endif()
 
+# Fixup wxWidgets paths for vcpkg debug builds.
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
+    set(wxWidgets_ROOT_DIR "${wxWidgets_ROOT_DIR}/debug" CACHE INTERNAL "wxWidgets root directory" FORCE)
+    string(REGEX REPLACE "/lib$" "/debug/lib" wxWidgets_LIB_DIR "${wxWidgets_LIB_DIR}")
+    set(wxWidgets_LIB_DIR "${wxWidgets_LIB_DIR}" CACHE INTERNAL "wxWidgets library directory" FORCE)
+endif()
+
 # Find OpenAL (required).
 find_package(OpenAL REQUIRED)
 
@@ -240,7 +247,7 @@ function(configure_wx_target target)
     _add_include_directories(${wxWidgets_INCLUDE_DIRS})
     _add_compile_options(${wxWidgets_CXX_FLAGS})
     _add_compile_definitions(${wxWidgets_DEFINITIONS})
-    if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
         _add_compile_definitions(${wxWidgets_DEFINITIONS_DEBUG})
     endif()
 
@@ -262,9 +269,15 @@ function(configure_wx_target target)
         if(MSVC)
             _add_link_libraries(FAudio::FAudio)
         else()
-            _add_link_libraries(FAudio)
             if(WIN32)
+                if(MINGW AND VBAM_STATIC)
+                    _add_link_libraries(FAudio.a)
+                else()
+                    _add_link_libraries(FAudio)
+                endif()
                 _add_link_libraries(dxguid uuid winmm ole32 advapi32 user32 mfplat mfreadwrite mfuuid propsys)
+            else()
+                _add_link_libraries(FAudio)
             endif()
         endif()
     endif()
@@ -380,10 +393,6 @@ if(WIN32)
         # Disable the auto-generated manifest from CMake.
         target_link_options(visualboyadvance-m PRIVATE "/MANIFEST:NO")
     endif()
-
-    # wxWidgets fails to bring in its dependency.
-    find_library(PCRE_LIB pcre2-16 REQUIRED)
-    target_link_libraries(visualboyadvance-m ${PCRE_LIB})
 endif()
 
 if(APPLE)
@@ -1010,13 +1019,13 @@ install(
 # Installation scripts.
 install(
     PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX}
-    DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 install(
     FILES ${CMAKE_SOURCE_DIR}/src/vba-over.ini
-    DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/vbam
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/vbam
 )
 
 if (UNIX)
-    install(FILES ${CMAKE_SOURCE_DIR}/src/debian/visualboyadvance-m.6 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man6)
+    install(FILES ${CMAKE_SOURCE_DIR}/src/debian/visualboyadvance-m.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
 endif()

src/wx/cmdevents.cpp

@@ -2219,7 +2219,7 @@ EVT_HANDLER(FAQ, "VBA-M support forum")
 
 EVT_HANDLER(Translate, "Translations")
 {
-    wxLaunchDefaultBrowser(wxT("http://www.transifex.com/projects/p/vba-m"));
+    wxLaunchDefaultBrowser(wxT("https://explore.transifex.com/bgk/vba-m/"));
 }
 
 // was About

src/wx/dialogs/accel-config.cpp

@@ -145,9 +145,11 @@ AccelConfig::AccelConfig(wxWindow* parent,
         PopulateTreeWithMenu(&command_to_item_id_, tree_, id, menu->GetMenu(i), recents,
                              menu->GetMenuLabelText(i) + '\n');
     }
-    tree_->ExpandAll();
     tree_->SelectItem(menu_id);
 
+    // Set a minimum size for the tree so the default dialog size is reasonable.
+    tree_->SetMinSize(wxSize(300, 300));
+
     int w, h;
     current_keys_->GetTextExtent("CTRL-ALT-SHIFT-ENTER", &w, &h);
     wxSize size(w, h);

src/wx/panel.cpp

@@ -952,10 +952,6 @@ void GameArea::ShowFullScreen(bool full)
         while (!tlw->popups.empty())
             tlw->popups.front()->Close();
 
-        // Some kbd accels can send a menu open event without a close event,
-        // this happens on Mac in HiDPI mode for the fullscreen toggle accel.
-        main_frame->SetMenusOpened(false);
-
         // mouse stays blank whenever full-screen
         HidePointer();
         cursz_valid = true;

src/wx/wxvbam.cpp

@@ -894,11 +894,15 @@ EVT_MOVE_START(MainFrame::OnMoveStart)
 EVT_MOVE_END(MainFrame::OnMoveEnd)
 EVT_SIZE(MainFrame::OnSize)
 
+#if defined(__WXMSW__)
+
 // For tracking menubar state.
 EVT_MENU_OPEN(MainFrame::MenuPopped)
 EVT_MENU_CLOSE(MainFrame::MenuPopped)
 EVT_MENU_HIGHLIGHT_ALL(MainFrame::MenuPopped)
 
+#endif  // defined(__WXMSW__)
+
 END_EVENT_TABLE()
 
 void MainFrame::OnActivate(wxActivateEvent& event)
@@ -1152,8 +1156,9 @@ void MainFrame::ResetMenuAccelerators() {
     ResetRecentAccelerators();
 }
 
-void MainFrame::MenuPopped(wxMenuEvent& evt)
-{
+#if defined(__WXMSW__)
+
+void MainFrame::MenuPopped(wxMenuEvent& evt) {
     // We consider the menu closed when the main menubar or system menu is closed, not any submenus.
     // On Windows nullptr is the system menu.
     if (evt.GetEventType() == wxEVT_MENU_CLOSE && (evt.GetMenu() == nullptr || evt.GetMenu()->GetMenuBar() == GetMenuBar()))
@@ -1166,18 +1171,16 @@ void MainFrame::MenuPopped(wxMenuEvent& evt)
 
 // On Windows, opening the menubar will stop the app, but DirectSound will
 // loop, so we pause audio here.
-void MainFrame::SetMenusOpened(bool state)
-{
+void MainFrame::SetMenusOpened(bool state) {
     menus_opened = state;
-
-#ifdef __WXMSW__
     if (menus_opened)
         soundPause();
     else if (!paused)
         soundResume();
-#endif
 }
 
+#endif  // defined(__WXMSW__)
+
 // ShowModal that also disables emulator loop
 // uses dialog_opened as a nesting counter
 int MainFrame::ShowModal(wxDialog* dlg)
@@ -1338,12 +1341,12 @@ int wxvbamApp::FilterEvent(wxEvent& event)
         return wxEventFilter::Event_Skip;
     }
 
-    if (!frame->CanProcessShortcuts()) {
+    if (event.GetEventType() != VBAM_EVT_USER_INPUT) {
+        // We only treat "VBAM_EVT_USER_INPUT" events here.
         return wxEventFilter::Event_Skip;
     }
 
-    if (event.GetEventType() != VBAM_EVT_USER_INPUT) {
-        // We only treat "VBAM_EVT_USER_INPUT" events here.
+    if (!frame->CanProcessShortcuts()) {
         return wxEventFilter::Event_Skip;
     }
 

src/wx/wxvbam.h

@@ -97,7 +97,7 @@ public:
     bool pending_fullscreen;
 #if __WXMAC__
     // I suppose making this work will require tweaking the bundle
-    void MacOpenFile(const wxString& f)
+    void MacOpenFile(const wxString& f) override
     {
         pending_load = f;
     };
@@ -219,10 +219,15 @@ public:
     // possible
     void StartModal();
     void StopModal();
-    // however, adding a handler for open/close menu to do the same is unsafe.
-    // there is no guarantee every show will be matched by a hide.
+
+#if defined(__WXMSW__)
+
+    // On Windows, we need to disable the audio loop when the menu is open. We also disable
+    // shortcuts to prevent issues. This is not necessary on other systems.
     void MenuPopped(wxMenuEvent& evt);
 
+#endif  // defined(__WXMSW__)
+
     // flags for enabling commands
     int cmd_enable;
 
@@ -285,7 +290,9 @@ public:
 
     virtual bool MenusOpened() { return menus_opened; }
 
-    virtual void SetMenusOpened(bool state);
+#if defined(__WXMSW__)
+    void SetMenusOpened(bool state);
+#endif  // defined(__WXMSW__)
 
     virtual bool DialogOpened() { return dialog_opened != 0; }
 

src/wx/xrc/AccelConfig.xrc

@@ -2,7 +2,7 @@
 <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
   <object class="wxDialog" name="AccelConfig">
     <title>Key Shortcuts</title>
-    <style>wxRESIZE_BORDER</style>
+    <style>wxRESIZE_BORDER|wxCLOSE_BOX</style>
     <object class="wxBoxSizer">
       <orient>wxVERTICAL</orient>
       <flag>wxEXPAND</flag>
@@ -56,6 +56,7 @@
             </object>
           </object>
           <object class="sizeritem">
+            <flag>wxEXPAND</flag>
             <object class="wxBoxSizer">
               <object class="sizeritem">
                 <object class="wxButton" name="Assign">
@@ -80,7 +81,6 @@
               </object>
               <orient>wxVERTICAL</orient>
             </object>
-            <flag>wxEXPAND</flag>
           </object>
           <object class="sizeritem">
             <flag>wxALL</flag>
@@ -98,6 +98,7 @@
             </object>
           </object>
           <object class="sizeritem">
+            <flag>wxEXPAND</flag>
             <object class="wxBoxSizer">
               <object class="sizeritem">
                 <flag>wxALL</flag>
@@ -113,7 +114,6 @@
               </object>
               <orient>wxVERTICAL</orient>
             </object>
-            <flag>wxEXPAND</flag>
           </object>
         </object>
       </object>

tools/builder/core.sh

@@ -34,8 +34,6 @@ case "\$CC" in
                     CMAKE_REQUIRED_ARGS="\$CMAKE_REQUIRED_ARGS -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=\$CC -DCMAKE_CXX_COMPILER=\$CXX"
                     ;;
             esac
-            export CC="ccache \$CC"
-            export CXX="ccache \$CXX"
         fi
         ;;
 esac
@@ -294,6 +292,7 @@ DIST_PRE_BUILD="$DIST_PRE_BUILD
 
 DIST_POST_BUILD="$DIST_POST_BUILD
     pkgconf         ln -sf \"\$BUILD_ROOT/root/bin/pkgconf\" \"\$BUILD_ROOT/root/bin/pkg-config\";
+    ccache          setup_ccache
     harfbuzz        rebuild_dist freetype -Dharfbuzz=enabled;
     flex-2.6.3      build_dist flex || :;
     libtool         ln -sf \"\$BUILD_ROOT/root/bin/libtoolize\" \"\$BUILD_ROOT/root/bin/glibtoolize\";
@@ -445,6 +444,7 @@ builder() {
     install_core_deps
     setup_perl
     setup_meson
+    setup_ccache
     setup_ninja
     delete_outdated_dists
     pre_build_all
@@ -623,6 +623,13 @@ setup_meson() {
     fi
 }
 
+setup_ccache() {
+    if command -v ccache >/dev/null; then
+        ln -sf "$(command -v ccache)" "$BUILD_ROOT/root/bin/${CC##*/}"
+        ln -sf "$(command -v ccache)" "$BUILD_ROOT/root/bin/${CXX##*/}"
+    fi
+}
+
 setup_ninja() {
     if [ -x /usr/local/bin/ninja ]; then
         ninja=/usr/local/bin/ninja