From 2a8132e5bc610564027e0330492bf1e9fe5cb71e Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 31 May 2024 10:15:37 -0700 Subject: [PATCH] llvmPackages_18.compiler-rt: adjust FreeBSD assert patch for LLVM 18 --- pkgs/development/compilers/llvm/common/compiler-rt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 23a966ce238f..67f9661cf743 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation ({ '' + (if stdenv.hostPlatform.isFreeBSD then # As per above, but in FreeBSD assert is a macro and simply allowing it to be implicitly declared causes Issues!!!!! '' - substituteInPlace lib/builtins/clear_cache.c lib/builtins/cpu_model.c \ + substituteInPlace lib/builtins/clear_cache.c lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \ --replace "#include " "#define assert(e) ((e)?(void)0:__assert(__FUNCTION__,__FILE__,__LINE__,#e))" '' else '' substituteInPlace lib/builtins/clear_cache.c \