summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAlec Theriault <alec.theriault@gmail.com>2018-12-05 20:46:21 -0800
committerBen Gamari <ben@well-typed.com>2019-01-23 14:07:28 -0500
commitefc95841503a78504c0aa00925fb22c4ec4627af (patch)
tree88ccd49a18f83f19418131e8cb31b635bb8cfddb /mk
parentdaff24bc74c1fed7efb1acde2d8f90dc9621a308 (diff)
downloadhaskell-efc95841503a78504c0aa00925fb22c4ec4627af.tar.gz
Hadrian: support in-tree GMP
Summary: This adds top-level configure flags '--with-intree-gmp' and '--with-framework-preferred', both of which are especially relevant on MacOS. Besides gaining two new flags, Hadrian also had to be taught what to do with the 'framework' in .cabal files. Test Plan: ./boot && ./configure --with-intree-gmp && ./hadrian/build.sh ./boot && ./configure --with-gmp-framework-preferred && ./hadrian/build.sh # on macos Reviewers: carter, snowleopard, alpmestan, hvr, goldfire, bgamari Subscribers: rwbarton, erikd GHC Trac Issues: #16001 Differential Revision: https://phabricator.haskell.org/D5417
Diffstat (limited to 'mk')
-rw-r--r--mk/config.mk.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index fb823ae29b..0119e9a984 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -898,6 +898,8 @@ ICONV_LIB_DIRS = @ICONV_LIB_DIRS@
GMP_INCLUDE_DIRS = @GMP_INCLUDE_DIRS@
GMP_LIB_DIRS = @GMP_LIB_DIRS@
+GMP_PREFER_FRAMEWORK = @GMP_PREFER_FRAMEWORK@
+GMP_FORCE_INTREE = @GMP_FORCE_INTREE@
CURSES_LIB_DIRS = @CURSES_LIB_DIRS@