diff --git a/hadrian/src/Builder.hs b/hadrian/src/Builder.hs index 1388ddee8104edc5479d94bcb48efa59d6c218d4..5e7de24e550790aa4403b110ed1bea26e70e3780 100644 --- a/hadrian/src/Builder.hs +++ b/hadrian/src/Builder.hs @@ -8,10 +8,7 @@ module Builder ( -- * Builder properties builderProvenance, systemBuilderPath, builderPath, isSpecified, needBuilders, runBuilder, runBuilderWith, runBuilderWithCmdOptions, getBuilderPath, - builderEnvironment, - - -- * Ad hoc builder invocation - applyPatch + builderEnvironment ) where import Control.Exception.Extra (Partial) @@ -178,7 +175,6 @@ data Builder = Alex | MergeObjects Stage -- ^ linker to be used to merge object files. | Nm | Objdump - | Patch | Python | Ranlib | Testsuite TestMode @@ -441,7 +437,6 @@ systemBuilderPath builder = case builder of Makeinfo -> fromKey "makeinfo" Nm -> fromKey "nm" Objdump -> fromKey "objdump" - Patch -> fromKey "patch" Python -> fromKey "python" Ranlib -> fromKey "ranlib" Testsuite _ -> fromKey "python" @@ -493,15 +488,6 @@ systemBuilderPath builder = case builder of isSpecified :: Builder -> Action Bool isSpecified = fmap (not . null) . systemBuilderPath --- | Apply a patch by executing the 'Patch' builder in a given directory. -applyPatch :: FilePath -> FilePath -> Action () -applyPatch dir patch = do - let file = dir -/- patch - needBuilders [Patch] - path <- builderPath Patch - putBuild $ "| Apply patch " ++ file - quietly $ cmd' [Cwd dir, FileStdin file] [path, "-p0"] - -- Note [cmd wrapper] -- ~~~~~~~~~~~~~~~~~~ -- `cmd'` is a wrapper for Shake's `cmd` that allows us to customize what is