diff --git a/.gitlab/before_script/linux/alpine/install_deps.sh b/.gitlab/before_script/linux/alpine/install_deps.sh index 84ee22b..655bbbb 100755 --- a/.gitlab/before_script/linux/alpine/install_deps.sh +++ b/.gitlab/before_script/linux/alpine/install_deps.sh @@ -18,8 +18,10 @@ apk add --no-cache \ tar \ perl -ln -s libncurses.so /usr/lib/libtinfo.so -ln -s libncursesw.so.6 /usr/lib/libtinfow.so.6 +ln -sf libncurses.so /usr/lib/libtinfo.so +ln -sf libncursesw.so.6 /usr/lib/libtinfow.so.6 +ln -sf libtinfow.so.6 /usr/lib/libtinfow.so + if [ "${BIT}" = "32" ] ; then curl -sSfL https://downloads.haskell.org/~ghcup/0.1.5/i386-linux-ghcup-0.1.5 > ./ghcup-bin else @@ -60,5 +62,5 @@ apk add --no-cache \ xz-dev \ ncurses-static -ln -s libncursesw.a /usr/lib/libtinfow.a +ln -sf libncursesw.a /usr/lib/libtinfow.a diff --git a/.gitlab/script/ghcup_release.sh b/.gitlab/script/ghcup_release.sh index 88213d0..402fbe4 100755 --- a/.gitlab/script/ghcup_release.sh +++ b/.gitlab/script/ghcup_release.sh @@ -16,7 +16,11 @@ git describe ecabal update if [ "${OS}" = "LINUX" ] ; then - ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui + if [ "${BIT}" = "32" ] ; then + ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' + else + ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui + fi elif [ "${OS}" = "FREEBSD" ] ; then ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections' --constraint="zlib static" else @@ -26,6 +30,10 @@ fi mkdir out cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')" . ver=$(./ghcup --numeric-version) -strip -s ./ghcup +if [ "${OS}" = "DARWIN" ] ; then + strip ./ghcup +else + strip -s ./ghcup +fi cp ghcup out/${ARTIFACT}-${ver} diff --git a/.gitlab/script/ghcup_version.sh b/.gitlab/script/ghcup_version.sh index 02f7f3b..952fab8 100755 --- a/.gitlab/script/ghcup_version.sh +++ b/.gitlab/script/ghcup_version.sh @@ -21,9 +21,9 @@ git describe --always ecabal update if [ "${OS}" = "DARWIN" ] ; then - ecabal build -w ghc-${GHC_VERSION} + ecabal build -w ghc-${GHC_VERSION} -ftui else - ecabal build -w ghc-${GHC_VERSION} -finternal-downloader + ecabal build -w ghc-${GHC_VERSION} -finternal-downloader -ftui fi cp "$(ecabal new-exec --enable-tests --verbose=0 --offline sh -- -c 'command -v ghcup')" .