From e98d32a62977fe1057ebbb1b6ed8990438cb9896 Mon Sep 17 00:00:00 2001 From: David Eichmann Date: Tue, 4 Jun 2019 19:01:19 +0100 Subject: Hadrian: Track RTS library symlink targets This requires creating RTS library symlinks when registering, outside of the rule for the registered library file. --- hadrian/src/Rules/Program.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hadrian/src/Rules/Program.hs') 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/@ to @stage1/bin/@. -- cgit v1.2.1