maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CMake] llvm_codesign workaround for Xcode double-signing errors 

Summary:
When using Xcode to build LLVM with code signing, the post-build rule is executed even if the actual build-step was skipped. This causes double-signing errors. We can currently only avoid it by passing the `--force` flag.

Plus some polishing for my previous patch D54443.

Reviewers: beanz, kubamracek

Reviewed By: kubamracek

Subscribers: #lldb, mgorny, llvm-commits

Differential Revision: https://reviews.llvm.org/D55116

llvm-svn: 349070
This commit is contained in:
Stefan Granitz 2018-12-13 18:51:19 +00:00
parent 9737096bb1
commit 405c5109e2
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
llvm/cmake/modules/AddLLVM.cmake
View File

@ -584,7 +584,7 @@ function(llvm_add_library name)
if(ARG_SHARED OR ARG_MODULE)
llvm_externalize_debuginfo(${name})
llvm_codesign(TARGET ${name})
llvm_codesign(${name})
endif()
endfunction()
@ -796,7 +796,7 @@ macro(add_llvm_executable name)
target_link_libraries(${name} PRIVATE ${LLVM_PTHREAD_LIB})
endif()
llvm_codesign(TARGET ${name} ENTITLEMENTS ${ARG_ENTITLEMENTS})
llvm_codesign(${name} ENTITLEMENTS ${ARG_ENTITLEMENTS})
endmacro(add_llvm_executable name)
function(export_executable_symbols target)
@ -1635,13 +1635,9 @@ function(llvm_externalize_debuginfo name)
endif()
endfunction()
# Usage: llvm_codesign(TARGET name [ENTITLEMENTS file])
#
# Code-sign the given TARGET with the global LLVM_CODESIGNING_IDENTITY or skip
# if undefined. Customize capabilities by passing a file path to ENTITLEMENTS.
#
function(llvm_codesign)
cmake_parse_arguments(ARG "" "TARGET;ENTITLEMENTS" "" ${ARGN})
# Usage: llvm_codesign(name [ENTITLEMENTS file])
function(llvm_codesign name)
cmake_parse_arguments(ARG "" "ENTITLEMENTS" "" ${ARGN})
if(NOT LLVM_CODESIGNING_IDENTITY)
return()
@ -1659,15 +1655,20 @@ function(llvm_codesign)
)
endif()
if(DEFINED ARG_ENTITLEMENTS)
set(PASS_ENTITLEMENTS --entitlements ${ARG_ENTITLEMENTS})
set(pass_entitlements --entitlements ${ARG_ENTITLEMENTS})
endif()
if(CMAKE_GENERATOR STREQUAL "Xcode")
# Avoid double-signing error: Since output overwrites input, Xcode runs
# the post-build rule even if the actual build-step was skipped.
set(pass_force --force)
endif()
add_custom_command(
TARGET ${ARG_TARGET} POST_BUILD
TARGET ${name} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
env CODESIGN_ALLOCATE=${CMAKE_CODESIGN_ALLOCATE}
${CMAKE_CODESIGN} -s ${LLVM_CODESIGNING_IDENTITY}
${PASS_ENTITLEMENTS} $<TARGET_FILE:${ARG_TARGET}>
${pass_entitlements} ${pass_force} $<TARGET_FILE:${name}>
)
endif()
endfunction()