diff options
| author | Artturin <Artturin@artturin.com> | 2023-09-06 07:24:40 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-09-06 19:16:28 +0300 |
| commit | 079fa2f075d515497c878683f768b3afba643bb5 (patch) | |
| tree | 2ae95039780170eb28c7d8444bad172d715f6fcc /pkgs/development/compilers/llvm/7 | |
| parent | ac62f864ca4422a1a9d4e0315d61d1321f9d369c (diff) | |
llvmPackages.compiler-rt: dedupe `codesign.patch` 7-12
found with fdupes ``` pkgs/development/compilers/llvm/8/compiler-rt/codesign.patch pkgs/development/compilers/llvm/10/compiler-rt/codesign.patch pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch pkgs/development/compilers/llvm/9/compiler-rt/codesign.patch pkgs/development/compilers/llvm/7/compiler-rt/codesign.patch pkgs/development/compilers/llvm/11/compiler-rt/codesign.patch ```
Diffstat (limited to 'pkgs/development/compilers/llvm/7')
| -rw-r--r-- | pkgs/development/compilers/llvm/7/compiler-rt/codesign.patch | 33 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/7/compiler-rt/default.nix | 2 |
2 files changed, 1 insertions, 34 deletions
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/codesign.patch b/pkgs/development/compilers/llvm/7/compiler-rt/codesign.patch deleted file mode 100644 index 3cc12b94b2005..0000000000000 --- a/pkgs/development/compilers/llvm/7/compiler-rt/codesign.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Tue, 19 Sep 2017 13:13:06 -0500 -Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that - needs it - ---- - cmake/Modules/AddCompilerRT.cmake | 8 ------ - test/asan/CMakeLists.txt | 52 --------------------------------------- - test/tsan/CMakeLists.txt | 47 ----------------------------------- - 3 files changed, 107 deletions(-) - -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff7..b64eb4246 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) - set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") - set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") - endif() -- if(APPLE) -- # Ad-hoc sign the dylibs -- add_custom_command(TARGET ${libname} -- POST_BUILD -- COMMAND codesign --sign - $<TARGET_FILE:${libname}> -- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} -- ) -- endif() - endif() - install(TARGETS ${libname} - ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} -2.14.1 - diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix index a644229ff07c9..7354397d2bf0f 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { patches = [ # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce ../../common/compiler-rt/glibc.patch - ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ../../common/compiler-rt/7-12-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./gnu-install-dirs.patch ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch ] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch |