hadrian/src/Flavour.hs

@@ -112,7 +112,7 @@ parseFlavour baseFlavours transformers str =
 
 -- | Add arguments to the 'args' of a 'Flavour'.
 addArgs :: Args -> Flavour -> Flavour
-addArgs args' fl = fl { args = args fl <> args' }
+addArgs args' fl = fl { extraArgs = extraArgs fl <> args' }
 
 -- | Turn on -Werror for packages built with the stage1 compiler.
 -- It mimics the CI settings so is useful to turn on when developing.
@@ -468,7 +468,7 @@ applySetting (KeyVal ks op v) = case runSettingsM ks builderPredicate of
   Left err -> throwError $
       "error while setting `" ++ intercalate "`." ks ++ ": " ++ err
   Right pred -> Right $ \flav -> flav
-    { args = update (args flav) pred }
+    { extraArgs = update (extraArgs flav) pred }
 
   where override arguments predicate = do
           holds <- predicate

hadrian/src/Flavour/Type.hs

@@ -14,8 +14,9 @@ import Data.Set (Set)
 data Flavour = Flavour {
     -- | Flavour name, to select this flavour from command line.
     name :: String,
-    -- | Use these command line arguments.
-    args :: Args,
+    -- | Use these extra command line arguments.
+    -- This can't depend on the result of configuring a package (ie, using readContextData)
+    extraArgs :: Args,
     -- | Build these packages.
     packages :: Stage -> Action [Package],
     -- | Bignum backend: 'native', 'gmp', 'ffi', etc.

hadrian/src/Hadrian/Haskell/Hash.hs-boot

+module Hadrian.Haskell.Hash where
+
+import Hadrian.Package
+import Stage
+import Development.Shake
+
+pkgUnitId :: Stage -> Package -> Action String
+

hadrian/src/Hadrian/Package.hs

@@ -81,4 +81,4 @@ instance NFData   PackageType
 
 instance Binary   Package
 instance Hashable Package
-instance NFData   Package
+instance NFData   Package
\ No newline at end of file

hadrian/src/Rules/BinaryDist.hs

@@ -132,7 +132,8 @@ bindistRules = do
         version        <- setting ProjectVersion
         targetPlatform <- setting TargetPlatformFull
         distDir        <- Context.distDir Stage1
-        rtsDir         <- pkgIdentifier rts
+        rtsDir         <- pkgUnitId Stage1 rts
+        -- let rtsDir  = "rts"
 
         let ghcBuildDir      = root -/- stageString Stage1
             bindistFilesDir  = root -/- "bindist" -/- ghcVersionPretty

hadrian/src/Settings.hs

 {-# LANGUAGE TupleSections #-}
 
 module Settings (
-    getArgs, getLibraryWays, getRtsWays, flavour, knownPackages,
+    getExtraArgs, getArgs, getLibraryWays, getRtsWays, flavour, knownPackages,
     findPackageByName, unsafeFindPackageByName, unsafeFindPackageByPath,
     isLibrary, stagePackages, getBignumBackend, getBignumCheck, completeSetting
     ) where
@@ -25,8 +25,11 @@ import Settings.Flavours.Validate
 import Settings.Flavours.Release
 
 
+getExtraArgs :: Args
+getExtraArgs = expr flavour >>= extraArgs
+
 getArgs :: Args
-getArgs = expr flavour >>= args
+getArgs = mconcat [ defaultBuilderArgs, getExtraArgs, defaultPackageArgs ]
 
 getLibraryWays :: Ways
 getLibraryWays = expr flavour >>= libraryWays