Commit 970e4802 authored by Matthew Pickering's avatar Matthew Pickering Committed by Marge Bot

hadrian: Properly partition options in sourceArgs

Previously if you build the `ghc` package then it would has the default
opts and the library opts. This is different behaviour to make where the
library opts are only reserved for things in the `libraries`
subdirectory (I believe)

Fixes #16716
parent 0462b0e0
Pipeline #6716 passed with stages
in 311 minutes and 40 seconds
......@@ -179,7 +179,10 @@ sourceArgs :: SourceArgs -> Args
sourceArgs SourceArgs {..} = builder Ghc ? mconcat
[ hsDefault
, getContextData hcOpts
, libraryPackage ? hsLibrary
-- `compiler` is also a library but the specific arguments that we want
-- to apply to that are given by the hsCompiler option. `ghc` is an
-- executable so we don't have to exclude that.
, libraryPackage ? notM (packageOneOf [compiler]) ? hsLibrary
, package compiler ? hsCompiler
, package ghc ? hsGhc ]
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment