summaryrefslogtreecommitdiff
path: root/distrib/configure.ac.in
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2017-07-23 10:43:52 -0400
committerBen Gamari <ben@smart-cactus.org>2017-07-23 10:43:53 -0400
commit98ab12ad0c13b6723cc667d6a00fe592f1833bf4 (patch)
treee9031a0ff38acd8786505243b54c192c748d09d5 /distrib/configure.ac.in
parentee1047e2283a3f628fd0d91df0e9eb955bb0994d (diff)
downloadhaskell-98ab12ad0c13b6723cc667d6a00fe592f1833bf4.tar.gz
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
Diffstat (limited to 'distrib/configure.ac.in')
-rw-r--r--distrib/configure.ac.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 314bb3a14e..8c7b226df4 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