Browse Source

Fix build on 32bit

tags/v0.1.9-rc1
Julian Ospald 3 years ago
parent
commit
6f1b8b4041
No known key found for this signature in database GPG Key ID: 511B62C09D50CD28
4 changed files with 19 additions and 6 deletions
  1. +3
    -0
      .gitlab-ci.yml
  2. +9
    -3
      .gitlab/script/ghcup_version.sh
  3. +6
    -2
      ghcup-0.0.2.yaml
  4. +1
    -1
      ghcup.cabal

+ 3
- 0
.gitlab-ci.yml View File

@@ -14,6 +14,7 @@ variables:
- x86_64-linux
variables:
OS: "LINUX"
BIT: "64"

.alpine:64bit:
image: "alpine:edge"
@@ -36,12 +37,14 @@ variables:
- x86_64-darwin
variables:
OS: "DARWIN"
BIT: "64"

.freebsd:
tags:
- x86_64-freebsd
variables:
OS: "FREEBSD"
BIT: "64"

.root_cleanup:
after_script:


+ 9
- 3
.gitlab/script/ghcup_version.sh View File

@@ -22,14 +22,20 @@ ecabal update

if [ "${OS}" = "DARWIN" ] ; then
ecabal build -w ghc-${GHC_VERSION} -ftui
elif [ "${OS}" = "LINUX" ] ; then
if [ "${BIT}" = "32" ] ; then
ecabal build -w ghc-${GHC_VERSION} -finternal-downloader -ftui -ftar
else
ecabal build -w ghc-${GHC_VERSION} -finternal-downloader -ftui
fi
else
ecabal build -w ghc-${GHC_VERSION} -finternal-downloader -ftui
fi

ecabal haddock
ecabal haddock -w ghc-${GHC_VERSION} -ftar

cp "$(ecabal new-exec --enable-tests --verbose=0 --offline sh -- -c 'command -v ghcup')" .
cp "$(ecabal new-exec --enable-tests --verbose=0 --offline sh -- -c 'command -v ghcup-gen')" .
cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --enable-tests --verbose=0 --offline sh -- -c 'command -v ghcup')" .
cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --enable-tests --verbose=0 --offline sh -- -c 'command -v ghcup-gen')" .

cp ./ghcup "$CI_PROJECT_DIR"/.local/bin/ghcup
cp ./ghcup-gen "$CI_PROJECT_DIR"/.local/bin/ghcup-gen


+ 6
- 2
ghcup-0.0.2.yaml View File

@@ -1305,7 +1305,7 @@ ghcupDownloads:
viArch:
A_64:
Linux_UnknownLinux:
unknown_versioning:
unknown_versioning: &ghcup-64
dlUri: https://downloads.haskell.org/~ghcup/0.1.8/x86_64-linux-ghcup-0.1.8
dlHash: 7ffcd4c3de156e895b648c75a36c762be2a4932883f3cd598f7a483c97d4a8a9
Darwin:
@@ -1316,8 +1316,12 @@ ghcupDownloads:
unknown_versioning:
dlUri: https://downloads.haskell.org/~ghcup/0.1.8/x86_64-portbld-freebsd-ghcup-0.1.8
dlHash: 442cdfe1b4525a327d9566e6270f909f7deba21c16dd4c7912537cf67e6cd521
Linux_Alpine:
unknown_versioning: *ghcup-64
A_32:
Linux_UnknownLinux:
unknown_versioning:
unknown_versioning: &ghcup-32
dlUri: https://downloads.haskell.org/~ghcup/0.1.8/i386-linux-ghcup-0.1.8
dlHash: 18ab162920cea662feae4b08f39d3879e9e416fde7b734afd8072c39d3c43cde
Linux_Alpine:
unknown_versioning: *ghcup-32

+ 1
- 1
ghcup.cabal View File

@@ -112,7 +112,7 @@ common io-streams
build-depends: io-streams >=1.5

common libarchive
build-depends: libarchive >= 2.2.5.2
build-depends: libarchive >= 2.2.5.0

common lzma
build-depends: lzma >=0.0.0.3


Loading…
Cancel
Save