[Git][ghc/ghc][wip/ci-docs] fix path

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/ci-docs at Glasgow Haskell Compiler / GHC


Commits:
0d490a6b by Matthew Pickering at 2024-02-28T22:29:17+00:00
fix path

- - - - -


1 changed file:

- .gitlab/ci.sh


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -151,8 +151,8 @@ function mingw_init() {
 
   # We always use mingw64 Python to avoid path length issues like #17483.
   export PYTHON="/mingw64/bin/python3"
-  # On the other hand, we need to use the system sphinx-build.exe as that's a "proper executable".
-  export SPHINXBUILD="/usr/bin/sphinx-build.exe"
+  # And need to use sphinx-build from the environment
+  export SPHINXBUILD="/mingw/bin/sphinx-build.exe"
 }
 
 # This will contain GHC's local native toolchain
@@ -192,7 +192,6 @@ function set_toolchain_paths() {
       CABAL="$toolchain/bin/cabal$exe"
       HAPPY="$toolchain/bin/happy$exe"
       ALEX="$toolchain/bin/alex$exe"
-      #SPHINXBUILD="/mingw64/bin/sphinx-build.exe"
       if [ "$(uname)" = "FreeBSD" ]; then
         GHC=/usr/local/bin/ghc
       fi
@@ -216,7 +215,6 @@ function set_toolchain_paths() {
       : ${CABAL:=$(which cabal)}
       : ${HAPPY:=$(which happy)}
       : ${ALEX:=$(which alex)}
-   #   : ${SPHINXBUILD:=$(which sphinx-build)}
       ;;
     *) fail "bad toolchain_source"
   esac
@@ -225,7 +223,6 @@ function set_toolchain_paths() {
   export CABAL
   export HAPPY
   export ALEX
-  #export SPHINXBUILD
 
   if [[ "${CROSS_TARGET:-}" == *"wasm"* ]]; then
     source "/home/ghc/.ghc-wasm/env"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0d490a6b0906783ddc586f537d1cfc41626f6ef8

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0d490a6b0906783ddc586f537d1cfc41626f6ef8
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/20240228/a334ede5/attachment-0001.html>