tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/cmake/macos/compilerconfig.cmake b/cmake/macos/compilerconfig.cmake
2index f0c900f28..4da64f0b3 100644
3--- a/cmake/macos/compilerconfig.cmake
4+++ b/cmake/macos/compilerconfig.cmake
5@@ -25,7 +25,7 @@ function(check_sdk_requirements)
6 set(ares_macos_minimum_sdk 11.1) # Minimum tested SDK
7 set(ares_macos_minimum_xcode 12.4) # Sync with SDK
8 execute_process(
9- COMMAND xcrun --sdk macosx --show-sdk-platform-version
10+ COMMAND echo @sdkVersion@
11 OUTPUT_VARIABLE ares_macos_current_sdk
12 RESULT_VARIABLE result
13 OUTPUT_STRIP_TRAILING_WHITESPACE
14diff --git a/cmake/macos/helpers.cmake b/cmake/macos/helpers.cmake
15index 3777ac98a..07ff17009 100644
16--- a/cmake/macos/helpers.cmake
17+++ b/cmake/macos/helpers.cmake
18@@ -35,7 +35,6 @@ function(ares_configure_executable target)
19 endif()
20 endif()
21
22- _bundle_dependencies(${target})
23
24 install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application)
25 endif()
26diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake
27index 7b594bb4a..18e886fe7 100644
28--- a/ruby/cmake/os-macos.cmake
29+++ b/ruby/cmake/os-macos.cmake
30@@ -41,7 +41,7 @@ target_link_libraries(
31 )
32
33 if(SDL_FOUND)
34- target_link_libraries(ruby PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>")
35+ target_link_libraries(ruby PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>")
36 endif()
37
38 if(librashader_FOUND)