diff options
| author | Zubin Duggal <zubin.duggal@gmail.com> | 2022-05-17 16:16:09 +0530 |
|---|---|---|
| committer | Zubin Duggal <zubin.duggal@gmail.com> | 2022-05-25 19:03:36 +0530 |
| commit | 96f428be46789b74f615a8d1ed10bf16ab19a156 (patch) | |
| tree | 337730868e64aee7d04a1a42d4c3058e226de62f | |
| parent | 36349f73e61ed7fb59f27944362f0c8d3366ed9f (diff) | |
| download | haskell-96f428be46789b74f615a8d1ed10bf16ab19a156.tar.gz | |
docs: Fix LlvmVersion in manpage (#21280)
(cherry picked from commit a36d12ee19afa949da27ab73f082428830f3dba3)
| -rw-r--r-- | docs/users_guide/codegens.rst | 4 | ||||
| -rw-r--r-- | docs/users_guide/conf.py | 5 | ||||
| -rw-r--r-- | docs/users_guide/ghc_config.py.in | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/docs/users_guide/codegens.rst b/docs/users_guide/codegens.rst index 1cad4b7659..deb9086ab9 100644 --- a/docs/users_guide/codegens.rst +++ b/docs/users_guide/codegens.rst @@ -50,8 +50,8 @@ compiler <http://clang.llvm.org>`__ compiler available on your ``PATH``. .. note:: - Note that this GHC release expects an LLVM version in the |llvm-version| - release series. + Note that this GHC release expects an LLVM version in the |llvm-version-min| + up to |llvm-version-max| (not inclusive) release series. To install LLVM and Clang: diff --git a/docs/users_guide/conf.py b/docs/users_guide/conf.py index 04631fc363..a7ad65ae83 100644 --- a/docs/users_guide/conf.py +++ b/docs/users_guide/conf.py @@ -41,8 +41,9 @@ nitpick_ignore = [ ] rst_prolog = """ -.. |llvm-version| replace:: {llvm_version} -""".format(llvm_version=ghc_config.llvm_version) +.. |llvm-version-min| replace:: {llvm_version_min} +.. |llvm-version-max| replace:: {llvm_version_max} +""".format(llvm_version_min=ghc_config.llvm_version_min, llvm_version_max=ghc_config.llvm_version_max) # General information about the project. project = u'Glasgow Haskell Compiler' diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in index e2f5c71d5d..dcc7fbaef6 100644 --- a/docs/users_guide/ghc_config.py.in +++ b/docs/users_guide/ghc_config.py.in @@ -20,4 +20,5 @@ lib_versions = { version = '@ProjectVersion@' -llvm_version = '@LlvmVersion@' +llvm_version_min = '@LlvmMinVersion@' +llvm_version_max = '@LlvmMaxVersion@' |