github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allow finishing build on OS X <10.13.6

Browse Source 
Building on OS X versions prior to 10.13.6 fails at the very end when
running `codesign`.
The `-options runtime`-argument isn't available on these earlier
versions of the OS.

Simply running codesign without that argument (on OS X <10.13.6) seems
to produce a runnable binary with no security warnings.
This commit is contained in:
Malthe Jørgensen 2020-03-22 11:21:29 +01:00 committed by ridiculousfish
parent 08b301721f
commit 8a068ed984
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -33,6 +33,7 @@
### For distributors and developers ### For distributors and developers
- fish source tarballs are now distributed using the XZ compression method (#5460). - fish source tarballs are now distributed using the XZ compression method (#5460).
- Allow finishing builds on OS X <10.13.6 (previously builds would fail at the `codesign` step)
--- ---

23
cmake/Mac.cmake
View File

@ -9,16 +9,27 @@ set(MAC_INJECT_GET_TASK_ALLOW ON CACHE BOOL "Inject get-task-allow on Mac")
function(CODESIGN_ON_MAC target) function(CODESIGN_ON_MAC target)
if(APPLE) if(APPLE)
execute_process(COMMAND sw_vers "-productVersion" OUTPUT_VARIABLE OSX_VERSION)
if(MAC_INJECT_GET_TASK_ALLOW) if(MAC_INJECT_GET_TASK_ALLOW)
set(ENTITLEMENTS "--entitlements" "${CMAKE_SOURCE_DIR}/osx/fish_debug.entitlements") set(ENTITLEMENTS "--entitlements" "${CMAKE_SOURCE_DIR}/osx/fish_debug.entitlements")
else() else()
set(ENTITLEMENTS "") set(ENTITLEMENTS "")
endif(MAC_INJECT_GET_TASK_ALLOW) endif(MAC_INJECT_GET_TASK_ALLOW)
add_custom_command( if(OSX_VERSION VERSION_LESS "10.13.6")
TARGET ${target} # `-options runtime` is only available in OS X from 10.13.6 and up
POST_BUILD add_custom_command(
COMMAND codesign --force --deep --options runtime ${ENTITLEMENTS} --sign "${MAC_CODESIGN_ID}" $<TARGET_FILE:${target}> TARGET ${target}
VERBATIM POST_BUILD
) COMMAND codesign --force --deep ${ENTITLEMENTS} --sign "${MAC_CODESIGN_ID}" $<TARGET_FILE:${target}>
VERBATIM
)
else()
add_custom_command(
TARGET ${target}
POST_BUILD
COMMAND codesign --force --deep --options runtime ${ENTITLEMENTS} --sign "${MAC_CODESIGN_ID}" $<TARGET_FILE:${target}>
VERBATIM
)
endif()
endif() endif()
endfunction(CODESIGN_ON_MAC target) endfunction(CODESIGN_ON_MAC target)