diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rw-r--r-- | hadrian/hadrian.cabal | 2 | ||||
| -rw-r--r-- | hadrian/src/Settings/Builders/Happy.hs | 2 | ||||
| -rw-r--r-- | mk/config.mk.in | 3 |
5 files changed, 7 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7cb158581d..1628e7bfe2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: GIT_SSL_NO_VERIFY: "1" # Commit of ghc/ci-images repository from which to pull Docker images - DOCKER_REV: cefaee3c742af193e0f7783f87edb0d35374515c + DOCKER_REV: ac65f31dcffb09cd7ca7aaa70f447fcbb19f427f # Sequential version number capturing the versions of all tools fetched by # .gitlab/win32-init.sh. @@ -176,7 +176,7 @@ validate-x86_64-linux-deb8-hadrian: hadrian-ghc-in-ghci: <<: *only-default stage: build - image: ghcci/x86_64-linux-deb8:0.1 + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb8:$DOCKER_REV" before_script: # workaround for docker permissions - sudo chown ghc:ghc -R . diff --git a/aclocal.m4 b/aclocal.m4 index 5004a05ec6..f33c50c5ac 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -951,8 +951,8 @@ changequote([, ])dnl ]) if test ! -f compiler/parser/Parser.hs || test ! -f compiler/cmm/CmmParse.hs then - FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.19.4], - [AC_MSG_ERROR([Happy version 1.19.4 or later is required to compile GHC.])])[] + FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.19.10], + [AC_MSG_ERROR([Happy version 1.19.10 or later is required to compile GHC.])])[] fi HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal index fdcba15b8d..e895334bae 100644 --- a/hadrian/hadrian.cabal +++ b/hadrian/hadrian.cabal @@ -132,7 +132,7 @@ executable hadrian , transformers >= 0.4 && < 0.6 , unordered-containers >= 0.2.1 && < 0.3 build-tools: alex >= 3.1 - , happy >= 1.19.4 + , happy >= 1.19.10 ghc-options: -Wall -Wincomplete-record-updates -Wredundant-constraints diff --git a/hadrian/src/Settings/Builders/Happy.hs b/hadrian/src/Settings/Builders/Happy.hs index edb520cdf3..5ffb2614cc 100644 --- a/hadrian/src/Settings/Builders/Happy.hs +++ b/hadrian/src/Settings/Builders/Happy.hs @@ -3,7 +3,7 @@ module Settings.Builders.Happy (happyBuilderArgs) where import Settings.Builders.Common happyBuilderArgs :: Args -happyBuilderArgs = builder Happy ? mconcat [ arg "-ag" -- TODO (int-index): restore the -c option when happy/pull/134 is merged. +happyBuilderArgs = builder Happy ? mconcat [ arg "-agc" , arg "--strict" , arg =<< getInput , arg "-o", arg =<< getOutput ] diff --git a/mk/config.mk.in b/mk/config.mk.in index 6abf01816f..e2712796ce 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -858,8 +858,7 @@ HAPPY_VERSION = @HappyVersion@ # # Options to pass to Happy when we're going to compile the output with GHC # -# TODO (int-index): restore the -c option when happy/pull/134 is merged. -SRC_HAPPY_OPTS = -ag --strict +SRC_HAPPY_OPTS = -agc --strict # # Alex |