From c3f3baddaa0405714913f77ebcb61628a871be00 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Nov 2022 12:07:41 +0000 Subject: [PATCH] Revert "llvmPackages_11: Add `$rsrc/lib` to default cflags" This reverts commit 2000ae54295e601a08ec13ea5057557a30b9a13a. This was intended as a fix for i686 cross compilation, but it has had other unforeseen consequences, such as breaking rust-bindgen. --- pkgs/development/compilers/llvm/11/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index c3abface37eb..82a78af85cac 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -43,7 +43,6 @@ let mkdir "$rsrc" ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - echo "-B $rsrc/lib" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"