diff options
| author | Stefan Schulze Frielinghaus <stefansf@linux.ibm.com> | 2019-10-08 10:23:21 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-11 22:10:51 -0400 |
| commit | 166e1c2adf73b69bfbbec81e98a78814a031ddc7 (patch) | |
| tree | 5c778508a75477df55757158b4df787032db5dc9 /hadrian/src/Rules/Program.hs | |
| parent | 30f5ac07a4843b42ed479462661e9d79f038cf09 (diff) | |
| download | haskell-166e1c2adf73b69bfbbec81e98a78814a031ddc7.tar.gz | |
Hadrian: Take care of assembler source files
Fixes #17286.
Diffstat (limited to 'hadrian/src/Rules/Program.hs')
| -rw-r--r-- | hadrian/src/Rules/Program.hs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hadrian/src/Rules/Program.hs b/hadrian/src/Rules/Program.hs index 6273f3da4d..df542c0f1e 100644 --- a/hadrian/src/Rules/Program.hs +++ b/hadrian/src/Rules/Program.hs @@ -114,10 +114,12 @@ buildBinary rs bin context@Context {..} = do when (stage > Stage0) $ do ways <- interpretInContext context (getLibraryWays <> getRtsWays) needLibrary [ (rtsContext stage) { way = w } | w <- ways ] - cSrcs <- interpretInContext context (getContextData cSrcs) - cObjs <- mapM (objectPath context) cSrcs - hsObjs <- hsObjects context - let binDeps = cObjs ++ hsObjs + asmSrcs <- interpretInContext context (getContextData asmSrcs) + asmObjs <- mapM (objectPath context) asmSrcs + cSrcs <- interpretInContext context (getContextData cSrcs) + cObjs <- mapM (objectPath context) cSrcs + hsObjs <- hsObjects context + let binDeps = asmObjs ++ cObjs ++ hsObjs need binDeps buildWithResources rs $ target context (Ghc LinkHs stage) binDeps [bin] synopsis <- pkgSynopsis package |