[commit: ghc] master: Ensure that RTS cabal file reflects dependency on libnuma (45ad0c3)

[git at git.haskell.org]

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

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

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

commit 45ad0c3946623bc8635d6e3964d9ebb1555a3df6
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon May 14 10:17:51 2018 -0400

    Ensure that RTS cabal file reflects dependency on libnuma
    
    Test Plan: Validate with Hadrian and `libnuma` support
    
    Reviewers: snowleopard, hvr, erikd, simonmar
    
    Subscribers: izgzhen, alpmestan, thomie, carter
    
    Differential Revision: https://phabricator.haskell.org/D4616


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

45ad0c3946623bc8635d6e3964d9ebb1555a3df6
 configure.ac     | 6 ++++++
 rts/rts.cabal.in | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/configure.ac b/configure.ac
index a8b8681..1f49128 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1258,6 +1258,12 @@ if test "$ac_cv_header_numa_h$ac_cv_header_numaif_h" = "yesyes" ; then
     AC_CHECK_LIB(numa, numa_available,HaveLibNuma=1)
 fi
 AC_DEFINE_UNQUOTED([HAVE_LIBNUMA], [$HaveLibNuma], [Define to 1 if you have libnuma])
+if test $HaveLibNuma = "YES" ; then
+  AC_SUBST([CabalHaveLibNuma],[True])
+else
+  AC_SUBST([CabalHaveLibNuma],[False])
+fi
+
 
 dnl ** Documentation
 dnl --------------------------------------------------------------
diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in
index 7c1df5a..a82deb0 100644
--- a/rts/rts.cabal.in
+++ b/rts/rts.cabal.in
@@ -20,6 +20,8 @@ flag mingwex
   default: @CabalMingwex@
 flag libdw
   default: @CabalHaveLibdw@
+flag libnuma
+  default: @CabalHaveLibNuma@
 flag 64bit
   default: @Cabal64bit@
 flag leading-underscore
@@ -88,6 +90,8 @@ library
     if flag(libdw)
        -- for backtraces
        extra-libraries: elf dw
+    if flag(libnuma)
+       extra-libraries: numa
     if !flag(smp)
        cpp-options: -DNOSMP