mirror/psxrecomp
1
0
Fork 0
mirror of https://github.com/RetroPortingToolKit/psxrecomp synced 2026-10-26 10:19:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #394 from tetrisgm/feat/distribution-macos-toolchain-check

Browse Source 
Accept the macOS toolchain pack and check Apple's CLT separately
This commit is contained in:
Matt Stanley
2026-09-25 21:59:36 -07:00
committed by GitHub
parent 049b27f178 8745375560
commit 4d7311c8cc
1 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
host/psxrecomp_codegen_host.c
+67 -2
View File
@@ -3081,8 +3081,17 @@ static int toolchain_bin_compiler_works(const char* bin) {
return 0;
}
#else
if (!join_path(clang, sizeof(clang), bin, "clang") || !path_is_file(clang))
if (!join_path(clang, sizeof(clang), bin, "clang") || !path_is_file(clang)) {
# if defined(__APPLE__)
/* The macOS pack (cmake-clang-v1-macos-universal) ships CMake, Ninja,
* ccache and Python only; compiling uses the system toolchain from
* Apple's Command Line Tools, checked by macos_system_compiler_works.
* A pack without clang is the normal macOS layout, not a broken one. */
return 1;
# else
return 0;
# endif
}
if (!join_path(lld, sizeof(lld), bin, "ld.lld") || !path_is_file(lld))
return 0;
#endif
@@ -3136,6 +3145,50 @@ static int toolchain_bin_compiler_works(const char* bin) {
return ok;
}
#if defined(__APPLE__)
/* True when Apple's Command Line Tools are installed and /usr/bin/clang can
* compile and link a tiny program. xcode-select runs first so a machine
* without the CLT gets a repair note instead of the xcrun install prompt on
* every wizard refresh. */
static int macos_system_compiler_works(void) {
char src[256], exe[256], cmd[1024];
FILE* f;
int ok;
if (!run_cmd_exit_zero("xcode-select -p >/dev/null 2>&1"))
return 0;
snprintf(src, sizeof(src), "/tmp/psxrecomp-cc-probe-%d.c", (int)getpid());
snprintf(exe, sizeof(exe), "/tmp/psxrecomp-cc-probe-%d", (int)getpid());
f = fopen(src, "wb");
if (!f)
return 0;
fputs("int main(void){return 0;}\n", f);
fclose(f);
snprintf(cmd, sizeof(cmd), "/usr/bin/clang \"%s\" -o \"%s\" >/dev/null 2>&1",
src, exe);
ok = run_cmd_exit_zero(cmd);
unlink(src);
unlink(exe);
return ok;
}
#endif
/* Pack health says nothing about the macOS system compiler (see above), so
* readiness checks it separately and explains how to fix it. The pack itself
* is left alone: a missing compiler must never delete a good download. */
static int host_system_compiler_ready(void) {
#if defined(__APPLE__)
if (macos_system_compiler_works())
return 1;
snprintf(g_tc_repair_note, sizeof(g_tc_repair_note),
"Apple's Command Line Tools are required to build the game. "
"Open Terminal, run: xcode-select --install then reopen this "
"app.");
return 0;
#else
return 1;
#endif
}
static int toolchain_bin_is_healthy(const char* bin) {
char cmake[1200];
if (!bin || !bin[0])
@@ -3320,7 +3373,7 @@ static int host_toolchain_is_ready(void) {
for (attempt = 0; attempt < 3; ++attempt) {
activate_toolchain_path();
if (host_portable_cmake_ready())
return 1;
return host_system_compiler_ready();
if (!g_toolchain_bin[0])
break;
discard_unhealthy_active_toolchain();
@@ -4409,6 +4462,18 @@ static void host_selfcheck_or_return(const PsxrecompCodegenHostConfig* cfg,
}
printf(",\n \"overlay_cache_configured\": %s", overlay_cache ? "true" : "false");
}
/* Build-tools readiness as wizard page 0 judges it, minus its cache
* healing: nothing is deleted or renamed here. toolchain_note carries the
* repair hint the wizard would show (e.g. missing Command Line Tools). */
{
int tc_ready;
g_tc_repair_note[0] = '\0';
activate_toolchain_path();
tc_ready = host_portable_cmake_ready() && host_system_compiler_ready();
printf(",\n \"toolchain_ready\": %s", tc_ready ? "true" : "false");
printf(",\n \"toolchain_note\": ");
host_json_str(g_tc_repair_note);
}
printf("\n}\n");
fflush(stdout);
exit(missing ? 2 : 0);