[commit: ghc] ghc-8.0: GhcMake: Clang/ASSERT fix (7d5bdea)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/7d5bdeac73d8ad593dbdeba4ee21d28a76bd18e7/ghc

>---------------------------------------------------------------

commit 7d5bdeac73d8ad593dbdeba4ee21d28a76bd18e7
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Mon Mar 7 14:32:07 2016 +0100

    GhcMake: Clang/ASSERT fix
    
    Test Plan: Build with clang
    
    Reviewers: thomie, rwbarton, austin, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1977
    
    (cherry picked from commit 5e2605e4e740d46014eaf3eb2b2b2e05a43bb8b2)


>---------------------------------------------------------------

7d5bdeac73d8ad593dbdeba4ee21d28a76bd18e7
 compiler/main/GhcMake.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
index 6232119..3655c0b 100644
--- a/compiler/main/GhcMake.hs
+++ b/compiler/main/GhcMake.hs
@@ -367,10 +367,12 @@ load how_much = do
           liftIO $ intermediateCleanTempFiles dflags mods_to_keep hsc_env1
 
           -- there should be no Nothings where linkables should be, now
-          ASSERT(   isNoLink (ghcLink dflags)
+          let just_linkables =
+                    isNoLink (ghcLink dflags)
                  || all (isJust.hm_linkable)
                         (filter ((== HsSrcFile).mi_hsc_src.hm_iface)
-                                (eltsUFM hpt4))) do
+                                (eltsUFM hpt4))
+          ASSERT( just_linkables ) do
 
           -- Link everything together
           linkresult <- liftIO $ link (ghcLink dflags) dflags False hpt4