diff options
Diffstat (limited to 'hadrian/src')
| -rw-r--r-- | hadrian/src/Builder.hs | 4 | ||||
| -rw-r--r-- | hadrian/src/Settings/Packages.hs | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/hadrian/src/Builder.hs b/hadrian/src/Builder.hs index 160eb44f7a..b80ac59f8d 100644 --- a/hadrian/src/Builder.hs +++ b/hadrian/src/Builder.hs @@ -390,6 +390,10 @@ instance H.Builder Builder where isOptional :: Builder -> Bool isOptional = \case Objdump -> True + -- alex and happy are not required when building source distributions + -- and ./configure will complain if they are not available when building in-tree + Happy -> True + Alex -> True _ -> False -- | Determine the location of a system 'Builder'. diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 85fd0812f6..871e7235f8 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -73,6 +73,7 @@ packageArgs = do , builder (Cabal Flags) ? mconcat [ andM [expr ghcWithInterpreter, notStage0] `cabalFlag` "internal-interpreter" , notM cross `cabalFlag` "terminfo" + , arg "-build-tool-depends" ] , builder (Haddock BuildPackage) ? arg ("--optghc=-I" ++ path) ] @@ -202,6 +203,14 @@ packageArgs = do , package runGhc ? builder Ghc ? input "**/Main.hs" ? (\version -> ["-cpp", "-DVERSION=" ++ show version]) <$> getSetting ProjectVersion + + --------------------------------- genprimopcode ------------------------ + , package genprimopcode + ? builder (Cabal Flags) ? arg "-build-tool-depends" + + --------------------------------- hpcBin ---------------------------------- + , package hpcBin + ? builder (Cabal Flags) ? arg "-build-tool-depends" ] ghcBignumArgs :: Args |