diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2020-07-11 00:05:08 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-07-14 21:33:19 -0400 |
| commit | 2379722438cb551210c4899119ade05989c17166 (patch) | |
| tree | e38315e8bfa2e5699e526e2d0bf355df7bfa3cf1 | |
| parent | 4c259f86938f4016f4bd4fde7a300fa83591036f (diff) | |
| download | haskell-2379722438cb551210c4899119ade05989c17166.tar.gz | |
.gitlab: re-enable integer-simple substitute (BIGNUM_BACKEND)
Recently build system migrated from INTEGER_LIBRARY to BIGNUM_BACKEND.
But gitlab CI was never updated. Let's enable BIGNUM_BACKEND=native.
Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/18437
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9917a7c5d3..21047966f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -603,7 +603,7 @@ validate-x86_64-linux-deb9-integer-simple: stage: full-build variables: BUILD_FLAVOUR: validate - INTEGER_LIBRARY: integer-simple + BIGNUM_BACKEND: native TEST_ENV: "x86_64-linux-deb9-integer-simple-validate" BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb9-linux-integer-simple.tar.xz" @@ -612,7 +612,7 @@ nightly-x86_64-linux-deb9-integer-simple: extends: .build-x86_64-linux-deb9 stage: full-build variables: - INTEGER_LIBRARY: integer-simple + BIGNUM_BACKEND: native TEST_ENV: "x86_64-linux-deb9-integer-simple" TEST_TYPE: slowtest @@ -879,7 +879,7 @@ release-x86_64-windows-integer-simple: <<: *release extends: validate-x86_64-windows variables: - INTEGER_LIBRARY: integer-simple + BIGNUM_BACKEND: native BUILD_FLAVOUR: "perf" diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 9d43f56a34..05ee3203f3 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -285,7 +285,7 @@ function prepare_build_mk() { if [[ -z "$BUILD_FLAVOUR" ]]; then fail "BUILD_FLAVOUR is not set"; fi if [[ -z ${BUILD_SPHINX_HTML:-} ]]; then BUILD_SPHINX_HTML=YES; fi if [[ -z ${BUILD_SPHINX_PDF:-} ]]; then BUILD_SPHINX_PDF=YES; fi - if [[ -z ${INTEGER_LIBRARY:-} ]]; then INTEGER_LIBRARY=integer-gmp; fi + if [[ -z ${BIGNUM_BACKEND:-} ]]; then BIGNUM_BACKEND=gmp; fi cat > mk/build.mk <<EOF V=1 @@ -295,7 +295,7 @@ HSCOLOUR_SRCS=YES BUILD_SPHINX_HTML=$BUILD_SPHINX_HTML BUILD_SPHINX_PDF=$BUILD_SPHINX_PDF BeConservative=YES -INTEGER_LIBRARY=$INTEGER_LIBRARY +BIGNUM_BACKEND=$BIGNUM_BACKEND XZ_CMD=$XZ BuildFlavour=$BUILD_FLAVOUR |