diff --git a/.gitlab/script/ghcup_bootstrap.sh b/.gitlab/script/ghcup_bootstrap.sh index 44e31a1..838f09e 100755 --- a/.gitlab/script/ghcup_bootstrap.sh +++ b/.gitlab/script/ghcup_bootstrap.sh @@ -6,20 +6,10 @@ set -eux mkdir -p "$CI_PROJECT_DIR"/.local/bin -ecabal() { - cabal "$@" -} - -eghcup() { - ghcup -v -c -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml "$@" -} - git describe --always ### build -ecabal update - export BOOTSTRAP_HASKELL_NONINTERACTIVE=yes export BOOTSTRAP_HASKELL_GHC_VERSION=$GHC_VERSION export BOOTSTRAP_HASKELL_CABAL_VERSION=$CABAL_VERSION diff --git a/lib/GHCup/Prelude/Process/Windows.hs b/lib/GHCup/Prelude/Process/Windows.hs index 17c75ac..81ff52f 100644 --- a/lib/GHCup/Prelude/Process/Windows.hs +++ b/lib/GHCup/Prelude/Process/Windows.hs @@ -231,8 +231,9 @@ createProcessWithMingwPath :: MonadIO m createProcessWithMingwPath cp = do msys2Dir <- liftIO ghcupMsys2Dir cEnv <- Map.fromList <$> maybe (liftIO getEnvironment) pure (env cp) - let mingWPaths = [msys2Dir "usr" "bin" - ,msys2Dir "mingw64" "bin"] + let mingWPaths = [msys2Dir "mingw64" "bin" + ,msys2Dir "usr" "bin" + ] paths = ["PATH", "Path"] curPaths = (\x -> maybe [] splitSearchPath (Map.lookup x cEnv)) =<< paths newPath = intercalate [searchPathSeparator] (mingWPaths ++ curPaths) diff --git a/scripts/bootstrap/bootstrap-haskell b/scripts/bootstrap/bootstrap-haskell index 69f1528..688f4d0 100755 --- a/scripts/bootstrap/bootstrap-haskell +++ b/scripts/bootstrap/bootstrap-haskell @@ -537,7 +537,7 @@ adjust_cabal_config() { else cabal_bin="$HOME/AppData/Roaming/cabal/bin" fi - edo cabal user-config -a "extra-prog-path: $(cygpath -w "$GHCUP_BIN"), $(cygpath -w "$cabal_bin"), $(cygpath -w "$GHCUP_MSYS2"/usr/bin), $(cygpath -w "$GHCUP_MSYS2"/mingw64/bin)" -a "extra-include-dirs: $(cygpath -w "$GHCUP_MSYS2"/mingw64/include)" -a "extra-lib-dirs: $(cygpath -w "$GHCUP_MSYS2"/mingw64/lib)" -f init + edo cabal user-config -a "extra-prog-path: $(cygpath -w "$GHCUP_BIN"), $(cygpath -w "$cabal_bin"), $(cygpath -w "$GHCUP_MSYS2"/mingw64/bin), $(cygpath -w "$GHCUP_MSYS2"/usr/bin)" -a "extra-include-dirs: $(cygpath -w "$GHCUP_MSYS2"/mingw64/include)" -a "extra-lib-dirs: $(cygpath -w "$GHCUP_MSYS2"/mingw64/lib)" -f init } ask_cabal_config_init() {