llvmPackages_{13,14,15,16,17}.compiler-rt: reorder cfi_startproc after label

fixes building with llvm_18+
2024-11-20 02:14:50 +00:00
parent 81f3651b2f
commit b4ccd4a123
1 changed files with 9 additions and 0 deletions
@@ -974,6 +974,15 @@ let
            lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18"
          )
        ) (metadata.getVersionFile "compiler-rt/gnu-install-dirs.patch")
+        ++
+          lib.optional
+            (lib.versionAtLeast metadata.release_version "13" && lib.versionOlder metadata.release_version "18")
+            (fetchpatch {
+              name = "cfi_startproc-after-label.patch";
+              url = "https://github.com/llvm/llvm-project/commit/7939ce39dac0078fef7183d6198598b99c652c88.patch";
+              stripLen = 1;
+              hash = "sha256-tGqXsYvUllFrPa/r/dsKVlwx5IrcJGccuR1WAtUg7/o=";
+            })
        ++ [
          # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the
          # extra `/`.