summaryrefslogtreecommitdiff
path: root/hadrian/src/Rules/Program.hs
diff options
context:
space:
mode:
authorDavid Eichmann <EichmannD@gmail.com>2019-06-04 19:01:19 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-06-13 02:50:00 -0400
commite98d32a62977fe1057ebbb1b6ed8990438cb9896 (patch)
tree81204fa5fd3a5f1ebd1c834dc0445a22dbc88a92 /hadrian/src/Rules/Program.hs
parenta657543c4d676b7e6e0984b72b31dd95949855e4 (diff)
downloadhaskell-e98d32a62977fe1057ebbb1b6ed8990438cb9896.tar.gz
Hadrian: Track RTS library symlink targets
This requires creating RTS library symlinks when registering, outside of the rule for the registered library file.
Diffstat (limited to 'hadrian/src/Rules/Program.hs')
-rw-r--r--hadrian/src/Rules/Program.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/hadrian/src/Rules/Program.hs b/hadrian/src/Rules/Program.hs
index 7efe6c42ae..96855a3927 100644
--- a/hadrian/src/Rules/Program.hs
+++ b/hadrian/src/Rules/Program.hs
@@ -15,6 +15,7 @@ import Settings.Default
import Target
import Utilities
import Rules.Library
+import Rules.Register
-- | TODO: Drop code duplication
buildProgramRules :: [(Resource, Int)] -> Rules ()
@@ -96,8 +97,7 @@ buildProgram bin ctx@(Context{..}) rs = do
-- but when building the program, we link against the *ghc-pkg registered* library e.g.
-- _build/stage1/lib/x86_64-linux-ghc-8.9.0.20190430/libHShaskeline-0.7.5.0-ghc8.9.0.20190430.so
-- so we use pkgRegisteredLibraryFile instead.
- need =<< mapM pkgRegisteredLibraryFile
- =<< contextDependencies ctx
+ registerPackages =<< contextDependencies ctx
cross <- flag CrossCompiling
-- For cross compiler, copy @stage0/bin/<pgm>@ to @stage1/bin/@.