From be4a1739c08c871ebb318eb6927ca04a48e60b81 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 4 Jun 2026 20:23:41 -0400 Subject: [PATCH 1/2] Fix issue where stale third-party bundles can be referenced, and fail to build. For example, my Silicon Mac found old x86 built libraries that were around for some reason --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a047858..2e72df1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,11 @@ option(COMPUTER_CPP_CODE_SIGN_APP "Code sign the macOS ComputerCpp.app bundle af option(COMPUTER_CPP_ENABLE_WARNINGS "Enable strict compiler warnings for project targets" ON) option(COMPUTER_CPP_ENABLE_SANITIZERS "Enable AddressSanitizer and UndefinedBehaviorSanitizer for project targets" OFF) +if(APPLE AND NOT DEFINED CACHE{CMAKE_FIND_FRAMEWORK}) + # Prefer SDK/Homebrew libraries over stale third-party framework bundles in /Library/Frameworks. + set(CMAKE_FIND_FRAMEWORK LAST) +endif() + function(computer_cpp_target_defaults target_name) target_compile_features(${target_name} PRIVATE cxx_std_20) From 72ddd943e029bd06ca5d5afbce97e36f7c313ce7 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 4 Jun 2026 20:24:14 -0400 Subject: [PATCH 2/2] Fall back to using `unpack` if no `table.unpack` --- src/cli/LuaPrelude.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cli/LuaPrelude.cpp b/src/cli/LuaPrelude.cpp index f570710..3e9fb9c 100644 --- a/src/cli/LuaPrelude.cpp +++ b/src/cli/LuaPrelude.cpp @@ -2563,6 +2563,7 @@ if not script then os.exit(2) end table.remove(arg, 1) +local unpack_args = table.unpack or unpack local chunk, load_error = loadfile(script) if not chunk then @@ -2571,7 +2572,7 @@ if not chunk then end local function main() - return chunk(table.unpack(arg)) + return chunk(unpack_args(arg)) end local ok, result = xpcall(main, debug.traceback)