[commit: ghc] master: distrib/configure: Carry FFI include/lib paths from source distribution (98ab12a)

[git at git.haskell.org]

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

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

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

commit 98ab12ad0c13b6723cc667d6a00fe592f1833bf4
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Jul 23 10:43:52 2017 -0400

    distrib/configure: Carry FFI include/lib paths from source distribution
    
    `FFILibDir` and `FFIIncludeDir` both show up in the `rts` library's
    package registration file.  We therefore must define them or else we'll
    end up with spurious `@FFILibDir@` strings in the package registration.
    
    In principle I think we could also take these as arguments to the
    bindist configure but this seems simpler and I don't want to verify this
    at the moment.
    
    Test Plan: Build bindist while passing `--with-ffi-libraries=...` to
    source distribution configure then try to install and use bindist.
    
    Reviewers: austin, hvr
    
    Subscribers: rwbarton, thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D3774


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

98ab12ad0c13b6723cc667d6a00fe592f1833bf4
 distrib/configure.ac.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 314bb3a..8c7b226 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -12,8 +12,15 @@ dnl--------------------------------------------------------------------
 
 FP_GMP
 
+dnl Various things from the source distribution configure
 bootstrap_target=@TargetPlatform@
 
+FFIIncludeDir=@FFIIncludeDir@
+FFILibDir=@FFILibDir@
+AC_SUBST(FFILibDir)
+AC_SUBST(FFIIncludeDir)
+
+
 # We have to run these unconditionally as FPTOOLS_SET_PLATFORM_VARS wants the
 # values it computes.
 AC_CANONICAL_BUILD