Skip to content

Commit

Permalink
llvmPackages_15.lldb: fix the manpages
Browse files Browse the repository at this point in the history
  • Loading branch information
rrbutani committed Jan 27, 2023
1 parent b4ee532 commit 19d1571
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
9 changes: 4 additions & 5 deletions pkgs/development/compilers/llvm/15/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,10 @@ let
python3 = pkgs.python3; # don't use python-boot
});

# Needs package for spinhx-automodapi: https://github.com/astropy/sphinx-automodapi
# lldb-manpages = lowPrio (tools.lldb.override {
# enableManpages = true;
# python3 = pkgs.python3; # don't use python-boot
# });
lldb-manpages = lowPrio (tools.lldb.override {
enableManpages = true;
python3 = pkgs.python3; # don't use python-boot
});

# pick clang appropriate for package set we are targeting
clang =
Expand Down
7 changes: 7 additions & 0 deletions pkgs/development/compilers/llvm/15/lldb/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ stdenv.mkDerivation (rec {
"-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"

# docs reference `automodapi` but it's not added to the extensions list when
# only building the manpages:
# https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54
#
# so, we just ignore the resulting errors
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++ lib.optionals doCheck [
"-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
Expand Down

0 comments on commit 19d1571

Please sign in to comment.