[commit: ghc] ghc-7.8: rts/package.conf.in: fix UNREG on --with-system-libffi when include-dir is passed explicitely (0c7ede8)

git at git.haskell.org git at git.haskell.org
Mon Feb 17 10:26:28 UTC 2014


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

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/0c7ede86c5bf66de2223c647cec3c5ee15bcb715/ghc

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

commit 0c7ede86c5bf66de2223c647cec3c5ee15bcb715
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Thu Feb 13 07:29:14 2014 -0600

    rts/package.conf.in: fix UNREG on --with-system-libffi when include-dir is passed explicitely
    
    Issue #8748
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
    Signed-off-by: Austin Seipp <austin at well-typed.com>
    (cherry picked from commit 2d0fa9aee78e5bfffb9a4580954825025a651be5)


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

0c7ede86c5bf66de2223c647cec3c5ee15bcb715
 rts/package.conf.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 010305f..4c8686f 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -57,9 +57,9 @@ extra-libraries:
 #endif
 
 #ifdef INSTALLING
-include-dirs:           INCLUDE_DIR PAPI_INCLUDE_DIR
+include-dirs:           INCLUDE_DIR PAPI_INCLUDE_DIR FFI_INCLUDE_DIR
 #else /* !INSTALLING */
-include-dirs:           TOP"/rts/dist/build" TOP"/includes" TOP"/includes/dist-derivedconstants/header"
+include-dirs:           TOP"/rts/dist/build" TOP"/includes" TOP"/includes/dist-derivedconstants/header" FFI_INCLUDE_DIR
 #endif
 
 includes:               Stg.h



More information about the ghc-commits mailing list