diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 33e4d3c998dd..fae0f963e905 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -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 `/`.