[commit: ghc] master: Fix windows build after D975 (78c9dea)

git at git.haskell.org git at git.haskell.org
Fri Oct 16 07:45:08 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/78c9deaf228b9ed40d9ca9632a181f18a112936f/ghc

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

commit 78c9deaf228b9ed40d9ca9632a181f18a112936f
Author: Tamar Christina <tamar at zhox.com>
Date:   Fri Oct 16 09:46:59 2015 +0200

    Fix windows build after D975
    
    Add a missing #ifdef
    
    Reviewed By: simonmar
    
    Differential Revision: https://phabricator.haskell.org/D1328


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

78c9deaf228b9ed40d9ca9632a181f18a112936f
 rts/Linker.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rts/Linker.c b/rts/Linker.c
index be5b3b8..af07fda 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -1758,7 +1758,9 @@ initLinker_ (int retain_cafs)
     addDLLHandle(WSTR("*.exe"), GetModuleHandle(NULL));
 #endif
 
+#ifdef USE_MMAP
     m32_allocator_init(&allocator);
+#endif
 
     IF_DEBUG(linker, debugBelch("initLinker: done\n"));
     return;



More information about the ghc-commits mailing list