diff options
| author | fuzzard <fuzzard@kodi.tv> | 2020-11-14 07:53:42 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2020-11-14 10:54:42 +1000 |
| commit | 57d41356243307ba1d02c7facb2fbaf6ff6e3f45 (patch) | |
| tree | a00309feb53ba3fc56f49b2504d58a612fb773af /cmake | |
| parent | a4fb12afc8ede6297bbff908dd712bef89426709 (diff) | |
[cmake] bump xcode 3.18.4
Xcode 12.2 introduces changes to arch types. 3.14.5 cant handle when multiple
default arch types are provided, and pulls just the first arch (resulting in arm64)
Fix was applied to 3.18.1, but figure best to go to latest of 3.18 series
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindCCache.cmake | 4 | ||||
| -rw-r--r-- | cmake/scripts/osx/ArchSetup.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmake/modules/FindCCache.cmake b/cmake/modules/FindCCache.cmake index a18d4e03e0..0f6463b709 100644 --- a/cmake/modules/FindCCache.cmake +++ b/cmake/modules/FindCCache.cmake @@ -16,8 +16,8 @@ if(CCACHE_FOUND) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}") - file(WRITE "${CMAKE_BINARY_DIR}/launch-c" "exec \"${CCACHE_PROGRAM}\" \"${CMAKE_C_COMPILER}\" \"$@\"\n") - file(WRITE "${CMAKE_BINARY_DIR}/launch-cxx" "exec \"${CCACHE_PROGRAM}\" \"${CMAKE_CXX_COMPILER}\" \"$@\"\n") + file(WRITE "${CMAKE_BINARY_DIR}/launch-c" "#!/bin/sh\nexec \"${CCACHE_PROGRAM}\" \"${CMAKE_C_COMPILER}\" \"$@\"\n") + file(WRITE "${CMAKE_BINARY_DIR}/launch-cxx" "#!/bin/sh\nexec \"${CCACHE_PROGRAM}\" \"${CMAKE_CXX_COMPILER}\" \"$@\"\n") execute_process(COMMAND chmod +x "${CMAKE_BINARY_DIR}/launch-c" "${CMAKE_BINARY_DIR}/launch-cxx") set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_BINARY_DIR}/launch-c" PARENT_SCOPE) diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake index 7d8f58bc43..f723aa24c4 100644 --- a/cmake/scripts/osx/ArchSetup.cmake +++ b/cmake/scripts/osx/ArchSetup.cmake @@ -23,6 +23,8 @@ else() endif() endif() +set(CMAKE_OSX_ARCHITECTURES ${CPU}) + # Additional SYSTEM_DEFINES list(APPEND SYSTEM_DEFINES -DHAS_POSIX_NETWORK -DHAS_OSX_NETWORK -DHAS_SDL -DHAS_ZEROCONF) |