[commit: ghc] master: Hadrian: fix dynamicGhcPrograms value for the quickest flavour (7d96d28)

git at git.haskell.org git at git.haskell.org
Sat Dec 8 05:05:04 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7d96d2816d11bc067ce5b7d68b4a6f0fb1cf0259/ghc

>---------------------------------------------------------------

commit 7d96d2816d11bc067ce5b7d68b4a6f0fb1cf0259
Author: Alp Mestanogullari <alp at well-typed.com>
Date:   Fri Dec 7 23:20:23 2018 -0500

    Hadrian: fix dynamicGhcPrograms value for the quickest flavour
    
    Quickest does not build anything in a dynamic way, so that
    flavour should default to not building "ghc programs" dynamically.
    
    I ran into this problem by building the 'docs' target with quickest,
    which failed because at some point we run a haddock command in a
    context whose Way is sensitive to dynamicGhcPrograms, and it
    started looking for dyn interface files when it shouldn't have.
    
    Test Plan: hadrian/build.sh --flavour=quickest docs
    
    Reviewers: snowleopard, bgamari
    
    Reviewed By: snowleopard
    
    Subscribers: rwbarton, carter
    
    Differential Revision: https://phabricator.haskell.org/D5419


>---------------------------------------------------------------

7d96d2816d11bc067ce5b7d68b4a6f0fb1cf0259
 hadrian/src/Settings/Flavours/Quickest.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hadrian/src/Settings/Flavours/Quickest.hs b/hadrian/src/Settings/Flavours/Quickest.hs
index 3c5f944..c0fd727 100644
--- a/hadrian/src/Settings/Flavours/Quickest.hs
+++ b/hadrian/src/Settings/Flavours/Quickest.hs
@@ -11,7 +11,8 @@ quickestFlavour = defaultFlavour
     { name        = "quickest"
     , args        = defaultBuilderArgs <> quickestArgs <> defaultPackageArgs
     , libraryWays = pure [vanilla]
-    , rtsWays     = pure [vanilla, threaded] }
+    , rtsWays     = pure [vanilla, threaded]
+    , dynamicGhcPrograms = return False }
 
 quickestArgs :: Args
 quickestArgs = sourceArgs SourceArgs



More information about the ghc-commits mailing list