diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-03-08 10:24:17 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-03-09 07:48:38 -0500 |
| commit | b760269c5914e128c07c66bacdbe86168003e82e (patch) | |
| tree | a65998a8aa1710871b9a56ecaeb9bf30dc43617d /hadrian | |
| parent | 6b2f09916e0c8c5f37c9fbe08eb076476501c8d6 (diff) | |
| download | haskell-b760269c5914e128c07c66bacdbe86168003e82e.tar.gz | |
Rip out perl dependency
The object splitter was the last major user of perl. There remain a few
uses in nofib but we can just rely on the system's perl for this since
it's not critical to the build.
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/cfg/system.config.in | 1 | ||||
| -rw-r--r-- | hadrian/src/Builder.hs | 2 | ||||
| -rw-r--r-- | hadrian/src/Rules/Nofib.hs | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/hadrian/cfg/system.config.in b/hadrian/cfg/system.config.in index affeeaa5d5..e3c612e0e2 100644 --- a/hadrian/cfg/system.config.in +++ b/hadrian/cfg/system.config.in @@ -23,7 +23,6 @@ system-ghc = @WithGhc@ system-ghc-pkg = @GhcPkgCmd@ tar = @TarCmd@ patch = @PatchCmd@ -perl = @PerlCmd@ xelatex = @XELATEX@ # Python 3 is required to run test driver. diff --git a/hadrian/src/Builder.hs b/hadrian/src/Builder.hs index 6c14eb4517..6d334d80f4 100644 --- a/hadrian/src/Builder.hs +++ b/hadrian/src/Builder.hs @@ -127,7 +127,6 @@ data Builder = Alex | Nm | Objdump | Patch - | Perl | Python | Ranlib | RunTest @@ -305,7 +304,6 @@ systemBuilderPath builder = case builder of Nm -> fromKey "nm" Objdump -> fromKey "objdump" Patch -> fromKey "patch" - Perl -> fromKey "perl" Python -> fromKey "python" Ranlib -> fromKey "ranlib" RunTest -> fromKey "python" diff --git a/hadrian/src/Rules/Nofib.hs b/hadrian/src/Rules/Nofib.hs index 0950605199..016f7e76c2 100644 --- a/hadrian/src/Rules/Nofib.hs +++ b/hadrian/src/Rules/Nofib.hs @@ -29,7 +29,6 @@ nofibRules = do makePath <- builderPath (Make "nofib") top <- topDirectory ghcPath <- builderPath (Ghc CompileHs Stage2) - perlPath <- builderPath Perl -- some makefiles in nofib rely on a $MAKE -- env var being defined @@ -39,7 +38,7 @@ nofibRules = do -- subdirectory, passing the path to -- the GHC to benchmark and perl to -- nofib's makefiles. - let nofibArgs = ["WithNofibHc=" ++ (top -/- ghcPath), "PERL=" ++ perlPath] + let nofibArgs = ["WithNofibHc=" ++ (top -/- ghcPath)] unit $ cmd (Cwd "nofib") [makePath] ["clean"] unit $ cmd (Cwd "nofib") [makePath] (nofibArgs ++ ["boot"]) (Exit e, Stdouterr log) <- cmd (Cwd "nofib") [makePath] nofibArgs |