[Git][ghc/ghc][master] 3 commits: hadrian: enable building stage1 haddock for cross ghc
Marge Bot (@marge-bot)
gitlab at gitlab.haskell.org
Wed Feb 26 00:25:08 UTC 2025
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
272eaef0 by Cheng Shao at 2025-02-25T19:24:43-05:00
hadrian: enable building stage1 haddock for cross ghc
This commit enables building stage1 haddock for cross ghc. Without
this change, hadrian would panic with "Unknown program" error when
building the _build/stage1/bin/cross-prefix-haddock program needed by
the docs-haddock target, even if it only needs to copy from
_build/stage0/bin/cross-prefix-haddock.
- - - - -
a794e733 by Cheng Shao at 2025-02-25T19:24:43-05:00
hadrian: enable building docs for cross targets
Hadrian used to omit the docs target as a part of binary-dist-dir for
cross targets. This commit enables docs to be built as a part of cross
bindists and it works just fine in CI.
- - - - -
6dba56e1 by Cheng Shao at 2025-02-25T19:24:43-05:00
ci: build haddock/sphinx-html for wasm jobs
This commit enables building haddock & sphinx-html documentation for
wasm targets. The docs are useful for end users and should be tested
in CI.
I've omitted pdf & manpage generation for the wasm target; I've never
found the pdf version of docs to be useful, and the manpage only
contains `ghc.1` where we really want `wasm32-wasi-ghc.1` but that
should be a separate issue to fix.
- - - - -
4 changed files:
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
- hadrian/src/Rules/BinaryDist.hs
- hadrian/src/Settings/Default.hs
Changes:
=====================================
.gitlab/generate-ci/gen_ci.hs
=====================================
@@ -1276,7 +1276,7 @@ cross_jobs = [
make_wasm_jobs cfg =
modifyJobs
( delVariable "BROKEN_TESTS"
- . setVariable "HADRIAN_ARGS" "--docs=none"
+ . setVariable "HADRIAN_ARGS" "--docs=no-sphinx-pdfs --docs=no-sphinx-man --haddock-for-hackage"
. delVariable "INSTALL_CONFIGURE_ARGS"
)
$ addValidateRule WasmBackend $ validateBuilds Amd64 (Linux AlpineWasm) cfg
=====================================
.gitlab/jobs.yaml
=====================================
@@ -1462,7 +1462,7 @@
"BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
"CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"CROSS_TARGET": "wasm32-wasi",
- "HADRIAN_ARGS": "--docs=none",
+ "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man --haddock-for-hackage",
"RUNTEST_ARGS": "",
"TEST_ENV": "x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
"XZ_OPT": "-9"
@@ -1526,7 +1526,7 @@
"BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
"CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"CROSS_TARGET": "wasm32-wasi",
- "HADRIAN_ARGS": "--docs=none",
+ "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man --haddock-for-hackage",
"RUNTEST_ARGS": "",
"TEST_ENV": "x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
"XZ_OPT": "-9"
@@ -1590,7 +1590,7 @@
"BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
"CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"CROSS_TARGET": "wasm32-wasi",
- "HADRIAN_ARGS": "--docs=none",
+ "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man --haddock-for-hackage",
"RUNTEST_ARGS": "",
"TEST_ENV": "x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
"XZ_OPT": "-9"
@@ -5731,7 +5731,7 @@
"BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
"CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"CROSS_TARGET": "wasm32-wasi",
- "HADRIAN_ARGS": "--docs=none",
+ "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man --haddock-for-hackage",
"RUNTEST_ARGS": "",
"TEST_ENV": "x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf"
}
@@ -5795,7 +5795,7 @@
"BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
"CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"CROSS_TARGET": "wasm32-wasi",
- "HADRIAN_ARGS": "--docs=none",
+ "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man --haddock-for-hackage",
"RUNTEST_ARGS": "",
"TEST_ENV": "x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf"
}
@@ -5859,7 +5859,7 @@
"BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
"CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"CROSS_TARGET": "wasm32-wasi",
- "HADRIAN_ARGS": "--docs=none",
+ "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man --haddock-for-hackage",
"RUNTEST_ARGS": "",
"TEST_ENV": "x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf"
}
=====================================
hadrian/src/Rules/BinaryDist.hs
=====================================
@@ -159,7 +159,7 @@ bindistRules = do
let lib_exe_targets = (lib_targets ++ (map (\(_, p) -> p) (bin_targets ++ iserv_targets)))
- let doc_target = if cross then [] else ["docs"]
+ let doc_target = ["docs"]
let other_targets = map (bindistFilesDir -/-) (["configure", "Makefile"] ++ bindistInstallFiles)
let all_targets = lib_exe_targets ++ doc_target ++ other_targets
=====================================
hadrian/src/Settings/Default.hs
=====================================
@@ -156,6 +156,7 @@ stage1Packages = do
, ghcInternal
, ghcPkg
, ghcPrim
+ , haddock
, haskeline
, hp2ps
, hsc2hs
@@ -174,8 +175,7 @@ stage1Packages = do
, if winTarget then win32 else unix
]
, when (not cross)
- [ haddock
- , hpcBin
+ [ hpcBin
, iserv
, runGhc
, ghcToolchainBin
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/64b0d4d061902c0f7443355fa4877ff6aad946d5...6dba56e1bd69f1af1b79b8d86132bd4e04998159
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/64b0d4d061902c0f7443355fa4877ff6aad946d5...6dba56e1bd69f1af1b79b8d86132bd4e04998159
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250225/fab7eb26/attachment-0001.html>
More information about the ghc-commits
mailing list