diff options
| author | David Eichmann <EichmannD@gmail.com> | 2019-05-03 18:53:26 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-05-21 17:01:16 -0400 |
| commit | 0af519ac583c3544b1c4b1315b38ba0174d3ccb1 (patch) | |
| tree | 83534ca5c91c6372737bc671ca6a38a90aff40e6 /hadrian/src/Rules.hs | |
| parent | 8fc654c3a00ab0cd842c3e8316f832170ea561d6 (diff) | |
| download | haskell-0af519ac583c3544b1c4b1315b38ba0174d3ccb1.tar.gz | |
Refactor Libffi and RTS rules
This removes a hack that copies libffi files to the rts
build directory. This was done in a libffi rule, but now
an rts rule correctly needs and copies the relevant
files from the libffi build dir to the rts build dir.
Issues: #16272 #16304
Diffstat (limited to 'hadrian/src/Rules.hs')
| -rw-r--r-- | hadrian/src/Rules.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hadrian/src/Rules.hs b/hadrian/src/Rules.hs index 78e3790d48..240e08dcdc 100644 --- a/hadrian/src/Rules.hs +++ b/hadrian/src/Rules.hs @@ -26,7 +26,6 @@ import qualified Rules.SimpleTargets import Settings import Target import UserSettings -import Utilities -- | @tool-args@ is used by tooling in order to get the arguments necessary @@ -120,7 +119,7 @@ packageTargets includeGhciLib stage pkg = do let pkgWays = if pkg == rts then getRtsWays else getLibraryWays ways <- interpretInContext context pkgWays libs <- mapM (pkgLibraryFile . Context stage pkg) ways - more <- libraryTargets includeGhciLib context + more <- Rules.Library.libraryTargets includeGhciLib context setupConfig <- pkgSetupConfigFile context return $ [setupConfig] ++ libs ++ more else do -- The only target of a program package is the executable. |