diff --git a/hadrian/src/Builder.hs b/hadrian/src/Builder.hs index 44fee7bd5f22e45b28210ae8ff0bfc3df6b416f5..98c24263bdccd4e1d956d507db521934a7335fdc 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) @@ -184,7 +181,6 @@ data Builder = Alex | MergeObjects Stage -- ^ linker to be used to merge object files. | Nm | Objdump - | Patch | Python | Ranlib | Testsuite TestMode @@ -443,7 +439,6 @@ systemBuilderPath builder = case builder of Makeinfo -> fromKey "makeinfo" Nm -> fromTargetTC "nm" (Toolchain.nmProgram . tgtNm) Objdump -> fromKey "objdump" - Patch -> fromKey "patch" Python -> fromKey "python" Ranlib -> fromTargetTC "ranlib" (maybeProg Toolchain.ranlibProgram . tgtRanlib) Testsuite _ -> fromKey "python" @@ -511,15 +506,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