diff --git a/README.md b/README.md index f02bbcac3c9965ffd3f05ea818a53f3d3785f393..16a09520d79f1fe7d070cb85637f9d023e434300 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ $ curl https://gitlab.haskell.org/haskell-wasm/ghc-wasm-meta/-/raw/master/bootst $ source ~/.ghc-wasm/env $ ghcup config add-release-channel https://gitlab.haskell.org/haskell-wasm/ghc-wasm-meta/-/raw/master/ghcup-wasm-0.0.9.yaml $ ghcup install ghc wasm32-wasi-9.12 -- $CONFIGURE_ARGS -$ cabal --with-compiler=wasm32-wasi-ghc-9.12 --with-hc-pkg=wasm32-wasi-ghc-pkg-9.12 --with-hsc2hs=wasm32-wasi-hsc2hs-9.12 build +$ cabal --with-compiler=wasm32-wasi-ghc-9.12 --with-hc-pkg=wasm32-wasi-ghc-pkg-9.12 --with-hsc2hs=wasm32-wasi-hsc2hs-9.12 --with-haddock=wasm32-wasi-haddock-9.12 build ``` In case you encounter any issue with `ghcup` based installation, diff --git a/setup.sh b/setup.sh index a3f4d2b3622f73f9f8bffb8d91912685088cff8b..d4c3de5f947d4379fbdca4f9992730fe6a5b1af1 100755 --- a/setup.sh +++ b/setup.sh @@ -222,14 +222,26 @@ tar xJf cabal.tar.xz --no-same-owner -C "$PREFIX/cabal/bin" 'cabal' mkdir -p "$PREFIX/wasm32-wasi-cabal/bin" echo "#!/bin/sh" >> "$PREFIX/wasm32-wasi-cabal/bin/wasm32-wasi-cabal" echo 'PREFIX=$(realpath "$(dirname "$0")"/../..)' >> "$PREFIX/wasm32-wasi-cabal/bin/wasm32-wasi-cabal" -echo \ - 'CABAL_DIR=$PREFIX/.cabal' \ - 'exec' \ - '$PREFIX/cabal/bin/cabal' \ - '--with-compiler=$PREFIX/wasm32-wasi-ghc/bin/wasm32-wasi-ghc' \ - '--with-hc-pkg=$PREFIX/wasm32-wasi-ghc/bin/wasm32-wasi-ghc-pkg' \ - '--with-hsc2hs=$PREFIX/wasm32-wasi-ghc/bin/wasm32-wasi-hsc2hs' \ - '${1+"$@"}' >> "$PREFIX/wasm32-wasi-cabal/bin/wasm32-wasi-cabal" +if [[ "$FLAVOUR" != 9.6 ]] && [[ "$FLAVOUR" != 9.8 ]]; then + echo \ + 'CABAL_DIR=$PREFIX/.cabal' \ + 'exec' \ + '$PREFIX/cabal/bin/cabal' \ + '--with-compiler=$PREFIX/wasm32-wasi-ghc/bin/wasm32-wasi-ghc' \ + '--with-hc-pkg=$PREFIX/wasm32-wasi-ghc/bin/wasm32-wasi-ghc-pkg' \ + '--with-hsc2hs=$PREFIX/wasm32-wasi-ghc/bin/wasm32-wasi-hsc2hs' \ + '--with-haddock=$PREFIX/wasm32-wasi-ghc/bin/wasm32-wasi-haddock' \ + '${1+"$@"}' >> "$PREFIX/wasm32-wasi-cabal/bin/wasm32-wasi-cabal" +else + echo \ + 'CABAL_DIR=$PREFIX/.cabal' \ + 'exec' \ + '$PREFIX/cabal/bin/cabal' \ + '--with-compiler=$PREFIX/wasm32-wasi-ghc/bin/wasm32-wasi-ghc' \ + '--with-hc-pkg=$PREFIX/wasm32-wasi-ghc/bin/wasm32-wasi-ghc-pkg' \ + '--with-hsc2hs=$PREFIX/wasm32-wasi-ghc/bin/wasm32-wasi-hsc2hs' \ + '${1+"$@"}' >> "$PREFIX/wasm32-wasi-cabal/bin/wasm32-wasi-cabal" +fi chmod 755 "$PREFIX/wasm32-wasi-cabal/bin/wasm32-wasi-cabal" mkdir "$PREFIX/.cabal"