diff options
| author | Alec Theriault <alec.theriault@gmail.com> | 2018-12-05 20:46:21 -0800 |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2019-01-23 14:07:28 -0500 |
| commit | efc95841503a78504c0aa00925fb22c4ec4627af (patch) | |
| tree | 88ccd49a18f83f19418131e8cb31b635bb8cfddb /aclocal.m4 | |
| parent | daff24bc74c1fed7efb1acde2d8f90dc9621a308 (diff) | |
| download | haskell-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 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index a7026e217a..62825c3068 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1780,8 +1780,22 @@ AC_DEFUN([FP_GMP], [directory containing gmp library])], [GMP_LIB_DIRS=$withval]) + AC_ARG_ENABLE([intree-gmp], + [AC_HELP_STRING([--with-intree-gmp], + [force using the in-tree GMP])], + [GMP_FORCE_INTREE=YES], + [GMP_FORCE_INTREE=NO]) + + AC_ARG_ENABLE([gmp-framework-preferred], + [AC_HELP_STRING([--with-gmp-framework-preferred], + [on OSX, prefer the GMP framework to the gmp lib])], + [GMP_PREFER_FRAMEWORK=YES], + [GMP_PREFER_FRAMEWORK=NO]) + AC_SUBST(GMP_INCLUDE_DIRS) AC_SUBST(GMP_LIB_DIRS) + AC_SUBST(GMP_FORCE_INTREE) + AC_SUBST(GMP_PREFER_FRAMEWORK) ])# FP_GMP # FP_CURSES |