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 /libraries/integer-gmp | |
| 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 'libraries/integer-gmp')
| -rw-r--r-- | libraries/integer-gmp/config.mk.in | 2 | ||||
| -rw-r--r-- | libraries/integer-gmp/configure.ac | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libraries/integer-gmp/config.mk.in b/libraries/integer-gmp/config.mk.in index b66f94c5ad..2556326b2d 100644 --- a/libraries/integer-gmp/config.mk.in +++ b/libraries/integer-gmp/config.mk.in @@ -10,6 +10,8 @@ ifeq "$(HaveFrameworkGMP)" "" HaveFrameworkGMP = @HaveFrameworkGMP@ endif +GMP_FORCE_INTREE = @GMP_FORCE_INTREE@ +GMP_PREFER_FRAMEWORK = @GMP_PREFER_FRAMEWORK@ GMP_INCLUDE_DIRS = @GMP_INCLUDE_DIRS@ GMP_LIB_DIRS = @GMP_LIB_DIRS@ diff --git a/libraries/integer-gmp/configure.ac b/libraries/integer-gmp/configure.ac index 1ccd48e698..d189375616 100644 --- a/libraries/integer-gmp/configure.ac +++ b/libraries/integer-gmp/configure.ac @@ -27,13 +27,13 @@ AC_ARG_WITH([gmp-libraries], [GMP_LIB_DIRS=$withval; LDFLAGS="-L$withval"], [GMP_LIB_DIRS=]) -AC_ARG_WITH([gmp-framework-preferred], +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_ARG_WITH([intree-gmp], +AC_ARG_ENABLE([intree-gmp], [AC_HELP_STRING([--with-intree-gmp], [force using the in-tree GMP])], [GMP_FORCE_INTREE=YES], |