[commit: ghc] master: rts/package.conf.in: Fix CPP usage (aaede1e)

git at git.haskell.org git at git.haskell.org
Sat Oct 22 23:21:13 UTC 2016


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

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

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

commit aaede1ec8265f3b4f8effbf33f7fd77eb7f87f99
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Oct 23 00:16:10 2016 +0100

    rts/package.conf.in: Fix CPP usage
    
    Summary:
    The configure script sets `HAVE_LIBNUMA` to either `0` or `1` but this
    file had `#ifdef HAVE_LIBNUMA`. This surfaced as a side-effect of
    1050e46b5b. CPP is really hard to get right.
    
    Test Plan: Validate on harbourmaster
    
    Reviewers: simonmar, bgamari, austin, mpickering
    
    Reviewed By: mpickering
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2631


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

aaede1ec8265f3b4f8effbf33f7fd77eb7f87f99
 rts/package.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 03848c4..5d8ab8b 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -37,7 +37,7 @@ extra-libraries:
 #ifdef HAVE_LIBFFI
                               , "ffi"
 #endif
-#ifdef HAVE_LIBNUMA
+#if HAVE_LIBNUMA
                               , "numa"
 #endif
 #ifdef mingw32_HOST_OS



More information about the ghc-commits mailing list