diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-24 10:59:57 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-05-30 13:44:50 -0400 |
| commit | cac8c7bb098002ddce0ef7c1e4429940d22d8cc2 (patch) | |
| tree | 547f1dba2414774d0c2fd6d2c5e5e838d22e00ad /utils | |
| parent | 6656f0165a30fc2a22208532ba384fc8e2f11b46 (diff) | |
| download | haskell-cac8c7bb098002ddce0ef7c1e4429940d22d8cc2.tar.gz | |
hadrian: Fix building from source-dist without alex/happy
This fixes two bugs which were adding dependencies on alex/happy when
building from a source dist.
* When we try to pass `--with-alex` and `--with-happy` to cabal when
configuring but the builders are not set. This is fixed by making them
optional.
* When we configure, cabal requires alex/happy because of the
build-tool-depends fields. These are now made optional with a cabal
flag (build-tool-depends) for compiler/hpc-bin/genprimopcode.
Fixes #21627
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/genprimopcode/genprimopcode.cabal | 7 | ||||
| -rw-r--r-- | utils/hpc/hpc-bin.cabal | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/utils/genprimopcode/genprimopcode.cabal b/utils/genprimopcode/genprimopcode.cabal index 2dc581dc49..2b92735c2f 100644 --- a/utils/genprimopcode/genprimopcode.cabal +++ b/utils/genprimopcode/genprimopcode.cabal @@ -17,6 +17,10 @@ Category: Development build-type: Simple cabal-version: 2.0 +Flag build-tool-depends + Description: Use build-tool-depends + Default: True + Executable genprimopcode Default-Language: Haskell2010 Main-Is: Main.hs @@ -26,4 +30,5 @@ Executable genprimopcode Syntax Build-Depends: base >= 4 && < 5, array - build-tool-depends: alex:alex >= 3.2.6, happy:happy >= 1.20.0 + if flag(build-tool-depends) + build-tool-depends: alex:alex >= 3.2.6, happy:happy >= 1.20.0 diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal index 6e344de856..62601cdb07 100644 --- a/utils/hpc/hpc-bin.cabal +++ b/utils/hpc/hpc-bin.cabal @@ -12,6 +12,10 @@ Category: Development build-type: Simple cabal-version: 2.0 +Flag build-tool-depends + Description: Use build-tool-depends + Default: True + Executable hpc Default-Language: Haskell2010 Main-Is: Main.hs @@ -36,4 +40,5 @@ Executable hpc array >= 0.1 && < 0.6, hpc >= 0.6.1 && < 0.7 - build-tool-depends: happy:happy >= 1.20.0 + if flag(build-tool-depends) + build-tool-depends: happy:happy >= 1.20.0 |