diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-02-27 11:30:08 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-02-29 05:11:27 -0500 |
| commit | 34c7d23074f47c720b5722ca14d78a34213eabb6 (patch) | |
| tree | fc654b510df05933a2d29b7b744e063e5e361d35 | |
| parent | 252e51179bd179f52e25dea762ef7b95bc56ce0a (diff) | |
| download | haskell-34c7d23074f47c720b5722ca14d78a34213eabb6.tar.gz | |
Fix Hadrian's ``--configure`` (fix #17883)
| -rw-r--r-- | hadrian/src/Settings/Packages.hs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 39fb92f7f5..02f483cc53 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -171,16 +171,17 @@ packageArgs = do gmpPackageArgs :: Args gmpPackageArgs = do - -- These are only used for non-in-tree builds. - librariesGmp <- getSetting GmpLibDir - includesGmp <- getSetting GmpIncludeDir + package integerGmp ? do + -- These are only used for non-in-tree builds. + librariesGmp <- getSetting GmpLibDir + includesGmp <- getSetting GmpIncludeDir - -- Windows is always built with inplace GMP until we have dynamic - -- linking working. - inTreeFlag <- getFlag GmpInTree - let inTree = inTreeFlag || windowsHost + -- Windows is always built with inplace GMP until we have dynamic + -- linking working. + inTreeFlag <- getFlag GmpInTree + let inTree = inTreeFlag || windowsHost - package integerGmp ? mconcat + mconcat [ builder (Cabal Setup) ? mconcat [ inTree ? arg "--configure-option=--with-intree-gmp" , flag GmpFrameworkPref ? |