diff options
| author | Rahul Butani <rrbutani@users.noreply.github.com> | 2023-01-15 15:17:55 -0800 |
|---|---|---|
| committer | Rahul Butani <rrbutani@users.noreply.github.com> | 2023-01-27 13:29:22 -0800 |
| commit | b4ee532f360090c3ed3277e7224763bd6429b412 (patch) | |
| tree | cc810880b1a3928d97a651db0e6e388c886e698b /pkgs/development/compilers | |
| parent | 1d3ca42323ce573a12dccf2590e3b18454a58289 (diff) | |
| download | nixlib-b4ee532f360090c3ed3277e7224763bd6429b412.tar nixlib-b4ee532f360090c3ed3277e7224763bd6429b412.tar.gz nixlib-b4ee532f360090c3ed3277e7224763bd6429b412.tar.bz2 nixlib-b4ee532f360090c3ed3277e7224763bd6429b412.tar.lz nixlib-b4ee532f360090c3ed3277e7224763bd6429b412.tar.xz nixlib-b4ee532f360090c3ed3277e7224763bd6429b412.tar.zst nixlib-b4ee532f360090c3ed3277e7224763bd6429b412.zip | |
llvmPackages_15.lldb: fix the build on `i686`
as detailed within, adding `asm/ptrace.h` leads to `asm/ptrace-abi.h` being included which defines preprocessor symbols that clash with identifiers used in the LLVM headers (`FS` and `CS` only defined on i686)
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/15/lldb/procfs.patch | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/15/lldb/procfs.patch b/pkgs/development/compilers/llvm/15/lldb/procfs.patch index a798216aa62c..7b200e86505c 100644 --- a/pkgs/development/compilers/llvm/15/lldb/procfs.patch +++ b/pkgs/development/compilers/llvm/15/lldb/procfs.patch @@ -1,14 +1,20 @@ --- a/source/Plugins/Process/Linux/Procfs.h +++ b/source/Plugins/Process/Linux/Procfs.h -@@ -10,6 +10,7 @@ +@@ -10,6 +10,13 @@ // sys/procfs.h on Android/Linux for all supported architectures. #include <sys/ptrace.h> +#include <asm/ptrace.h> ++ ++// on i686 preprocessor symbols with these register names are defined as ++// numeric constants; these symbols clash with identifier names used in ++// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` ++#undef FS ++#undef CS #include "lldb/lldb-types.h" -@@ -17,23 +18,13 @@ +@@ -17,23 +24,13 @@ #include <vector> |