-
-
Notifications
You must be signed in to change notification settings - Fork 14k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
llvmPackages_15.compiler-rt: fixes for Darwin
this introduces a codesigning related patch that we can drop once #195107 goes through see: #194634 (comment) (cherry picked from commit 00839fe)
- Loading branch information
1 parent
ace04ab
commit 690c2d8
Showing
3 changed files
with
36 additions
and
34 deletions.
There are no files selected for viewing
33 changes: 0 additions & 33 deletions
33
pkgs/development/compilers/llvm/15/compiler-rt/codesign.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake | ||
--- a/cmake/Modules/AddCompilerRT.cmake | ||
+++ b/cmake/Modules/AddCompilerRT.cmake | ||
@@ -406,7 +406,7 @@ function(add_compiler_rt_runtime name type) | ||
if (HAD_ERROR) | ||
message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}") | ||
endif() | ||
- set(NEED_EXPLICIT_ADHOC_CODESIGN 1) | ||
+ set(NEED_EXPLICIT_ADHOC_CODESIGN 0) # `postLinkSignHook` handles this for us | ||
if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*") | ||
string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT}) | ||
if (HOST_LINK_VERSION VERSION_GREATER_EQUAL 609) |