From 2f9cc7e46f687634fcfd086a4b66f6d4ada61660 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 18 Feb 2022 07:01:18 +0000
Subject: [PATCH] Bug 1755834 - Remove compiler-rt-13-no-codesign.patch.
 r=firefox-build-system-reviewers,andi

Now that mac compiler-rts are built with build-compiler-rt.sh, which has
its own hack around codesign (which was broken in bug 1755415, so fix that),
we don't need this patch anymore.

Differential Revision: https://phabricator.services.mozilla.com/D138985
---
 build/build-clang/clang-13.json               |  1 -
 build/build-clang/clang-trunk.json            |  3 +--
 .../compiler-rt-13-no-codesign.patch          | 19 -------------------
 taskcluster/scripts/misc/build-compiler-rt.sh |  1 +
 4 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 build/build-clang/compiler-rt-13-no-codesign.patch

diff --git a/build/build-clang/clang-13.json b/build/build-clang/clang-13.json
index 7f1d378dcfae..6f7d9b6921ec 100644
--- a/build/build-clang/clang-13.json
+++ b/build/build-clang/clang-13.json
@@ -9,7 +9,6 @@
       "bug47258-extract-symbols-mbcs.patch",
       "Remove-FlushViewOfFile-when-unmaping-gcda-files.patch",
       "fuzzing_ccov_build_clang_12.patch",
-      "compiler-rt-13-no-codesign.patch",
       "win64-no-symlink.patch",
       "revert-llvmorg-13-init-8182-gc2297544c047.patch",
       "revert-llvmorg-12-init-7827-g2a078c307204.patch",
diff --git a/build/build-clang/clang-trunk.json b/build/build-clang/clang-trunk.json
index 9be431993dd5..536f64eb93bb 100644
--- a/build/build-clang/clang-trunk.json
+++ b/build/build-clang/clang-trunk.json
@@ -8,7 +8,6 @@
     "downgrade-mangling-error_clang_12.patch",
     "bug47258-extract-symbols-mbcs.patch",
     "Remove-FlushViewOfFile-when-unmaping-gcda-files.patch",
-    "fuzzing_ccov_build_clang_12.patch",
-    "compiler-rt-13-no-codesign.patch"
+    "fuzzing_ccov_build_clang_12.patch"
   ]
 }
diff --git a/build/build-clang/compiler-rt-13-no-codesign.patch b/build/build-clang/compiler-rt-13-no-codesign.patch
deleted file mode 100644
index 2678a249393d..000000000000
--- a/build/build-clang/compiler-rt-13-no-codesign.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
-index bc69ec95c419..9f100fdcec2f 100644
---- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
-+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
-@@ -366,14 +366,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_OUTPUT_LIBRARY_DIR}
--        )
--      endif()
-     endif()
- 
-     set(parent_target_arg)
diff --git a/taskcluster/scripts/misc/build-compiler-rt.sh b/taskcluster/scripts/misc/build-compiler-rt.sh
index a9e9e05e875d..cec673f9b604 100755
--- a/taskcluster/scripts/misc/build-compiler-rt.sh
+++ b/taskcluster/scripts/misc/build-compiler-rt.sh
@@ -70,6 +70,7 @@ case "$target" in
   # Give it a fake one.
   echo "#!/bin/sh" > codesign
   chmod +x codesign
+  PATH="$PATH:$PWD"
   ;;
 *-linux-android)
   cflags="