Commit 5b49f649 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Minor tweaks

parent 0e27bf41
......@@ -21,9 +21,7 @@ builder b = (b ==) <$> getBuilder
-- | Is a certain builder used in the current stage?
stagedBuilder :: (Stage -> Builder) -> Predicate
stagedBuilder stageBuilder = do
s <- getStage
builder (stageBuilder s)
stagedBuilder stageBuilder = builder . stageBuilder =<< getStage
-- | Are we building with GCC?
builderGcc :: Predicate
......
......@@ -51,10 +51,10 @@ argSetting :: Setting -> Args
argSetting = argM . setting
argSettingList :: SettingList -> Args
argSettingList = (append =<<) . lift . settingList
argSettingList = (append =<<) . getSettingList
argStagedSettingList :: (Stage -> SettingList) -> Args
argStagedSettingList ss = (argSettingList . ss) =<< getStage
argStagedSettingList ss = argSettingList . ss =<< getStage
argStagedBuilderPath :: (Stage -> Builder) -> Args
argStagedBuilderPath sb = (argM . builderPath . sb) =<< getStage
argStagedBuilderPath sb = argM . builderPath . sb =<< getStage
......@@ -131,7 +131,7 @@ with b = specified b ? do
append [withBuilderKey b ++ top -/- path]
withStaged :: (Stage -> Builder) -> Args
withStaged sb = (with . sb) =<< getStage
withStaged sb = with . sb =<< getStage
needDll0 :: Stage -> Package -> Action Bool
needDll0 stage pkg = do
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment