First cross try

.gitlab-ci.yml

@@ -161,7 +161,7 @@ release:linux:32bit:
   before_script:
     - ./.gitlab/before_script/linux/alpine/install_deps.sh
   variables:
-    ARTIFACT: "i386-linux-ghcup"
+    ARTIFACT: "x86_64-linux-ghcup"
     GHC_VERSION: "8.8.3"
     CABAL_VERSION: "3.2.0.0"
 

.gitlab/before_script/linux/alpine/install_deps.sh

@@ -42,8 +42,7 @@ chmod +x "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal"
 
 # utils
 apk add --no-cache \
-	bash \
-	git
+	bash
 
 ## Package specific
 apk add --no-cache \

.gitlab/before_script/linux/install_deps.sh

@@ -3,7 +3,7 @@
 set -eux
 
 sudo apt-get update -y
-sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev git
+sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev
 
 . "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"
 

.gitlab/script/ghcup_release.sh

@@ -15,8 +15,6 @@ ecabal update
 
 if [ "${OS}" = "LINUX" ] ; then
 	ecabal build -w ghc-${GHC_VERSION} -fcurl --ghc-options='-split-sections -optl-static'
-elif [ "${OS}" = "FREEBSD" ] ; then
-	ecabal build -w ghc-${GHC_VERSION} -fcurl --ghc-options='-split-sections'
 else
 	ecabal build -w ghc-${GHC_VERSION} -fcurl
 fi

lib/GHCup/Data/ToolRequirements.hs

@@ -5,7 +5,6 @@ module GHCup.Data.ToolRequirements where
 
 import           GHCup.Types
 import           GHCup.Utils.String.QQ
-import           GHCup.Utils.Version.QQ
 
 import qualified Data.Map                      as M
 
@@ -62,35 +61,6 @@ toolRequirements = M.fromList
                 )
               ]
             )
-          , ( Linux CentOS
-            , M.fromList
-              [ ( Nothing
-                , Requirements
-                  [ "gcc"
-                  , "gcc-c++"
-                  , "gmp"
-                  , "make"
-                  , "ncurses"
-                  , "ncurses-compat-libs"
-                  , "xz"
-                  , "perl"
-                  ]
-                  ""
-                ),
-              ( Just [vers|7|]
-                , Requirements
-                  [ "gcc"
-                  , "gcc-c++"
-                  , "gmp"
-                  , "make"
-                  , "ncurses"
-                  , "xz"
-                  , "perl"
-                  ]
-                  ""
-                )
-              ]
-            )
           , ( Darwin
             , M.fromList
               [ ( Nothing

lib/GHCup/Utils.hs

@@ -174,7 +174,6 @@ ghcSet mtarget = do
   ghcBin <- (</> ghc) <$> liftIO ghcupBinDir
 
   -- link destination is of the form ../ghc/<ver>/bin/ghc
-  -- for old ghcup, it is ../ghc/<ver>/bin/ghc-<ver>
   liftIO $ handleIO' NoSuchThing (\_ -> pure $ Nothing) $ do
     link <- readSymbolicLink $ toFilePath ghcBin
     Just <$> ghcLinkVersion link
@@ -194,8 +193,8 @@ ghcSet mtarget = do
              MP.setInput rest
              pure x
            )
-        <* MP.chunk "/"
-        <* MP.takeRest
+        <* MP.chunk "/bin/"
+        <* ghcTargetBinP "ghc"
         <* MP.eof