diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-10-11 10:31:58 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-10-11 10:31:58 -0400 |
| commit | 52b514003c60492f21790a823c488c49ec5fc89d (patch) | |
| tree | a87141d383de4bb147dfdb7ae2a8fb751376d462 /compiler/main/GHC.hs | |
| parent | 2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3 (diff) | |
| parent | 7ce9ead4fddfbffb5cb63cce0f1b4533b7bcc0ad (diff) | |
| download | haskell-ghc-8.2.tar.gz | |
Merge commit '7ce9ead4fddfbffb5cb63cce0f1b4533b7bcc0ad' into ghc-8.2ghc-8.2
John Ericson from Obsidian Systems proposed that we merge these
backports, which Obsidian bases its cross-compiled builds on, to the
upstream stable branch. I don't see why not.
Diffstat (limited to 'compiler/main/GHC.hs')
| -rw-r--r-- | compiler/main/GHC.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs index 8f508411b6..700e4826d1 100644 --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs @@ -489,7 +489,8 @@ initGhcMonad :: GhcMonad m => Maybe FilePath -> m () initGhcMonad mb_top_dir = do { env <- liftIO $ do { mySettings <- initSysTools mb_top_dir - ; dflags <- initDynFlags (defaultDynFlags mySettings) + ; myLlvmTargets <- initLlvmTargets mb_top_dir + ; dflags <- initDynFlags (defaultDynFlags mySettings myLlvmTargets) ; checkBrokenTablesNextToCode dflags ; setUnsafeGlobalDynFlags dflags -- c.f. DynFlags.parseDynamicFlagsFull, which |