diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-02-09 21:55:20 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-02-09 21:55:20 +0000 |
| commit | 1b91e7057f674be469c582b718f6a0b1d33e78ab (patch) | |
| tree | 3569d479d4f29407c32bd332d2b4adc895d89d20 /libraries | |
| parent | 916be615048cc844498319f4a21cc62bec162cd8 (diff) | |
| download | haskell-1b91e7057f674be469c582b718f6a0b1d33e78ab.tar.gz | |
Never try to use the system gmp on Windows
Apparently building on Windows failed when there is a system gmp
available.
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/integer-gmp/configure.ac | 21 | ||||
| -rw-r--r-- | libraries/integer-gmp/gmp/ghc.mk | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | libraries/integer-gmp/gmp/ln | 0 |
3 files changed, 21 insertions, 6 deletions
diff --git a/libraries/integer-gmp/configure.ac b/libraries/integer-gmp/configure.ac index d7c0b3e9ac..5593ca27fe 100644 --- a/libraries/integer-gmp/configure.ac +++ b/libraries/integer-gmp/configure.ac @@ -33,6 +33,12 @@ AC_ARG_WITH([gmp-framework-preferred], [GMP_PREFER_FRAMEWORK=YES], [GMP_PREFER_FRAMEWORK=NO]) +AC_ARG_WITH([intree-gmp], + [AC_HELP_STRING([--with-intree-gmp], + [force using the in-tree GMP])], + [GMP_FORCE_INTREE=YES], + [GMP_FORCE_INTREE=NO]) + dnl-------------------------------------------------------------------- dnl * Detect gmp dnl-------------------------------------------------------------------- @@ -42,13 +48,16 @@ GMP_LIBS= HaveFrameworkGMP=NO GMP_FRAMEWORK= -if test "$GMP_PREFER_FRAMEWORK" = "YES" +if test "$GMP_FORCE_INTREE" != "YES" then - LOOK_FOR_GMP_FRAMEWORK - LOOK_FOR_GMP_LIB -else - LOOK_FOR_GMP_LIB - LOOK_FOR_GMP_FRAMEWORK + if test "$GMP_PREFER_FRAMEWORK" = "YES" + then + LOOK_FOR_GMP_FRAMEWORK + LOOK_FOR_GMP_LIB + else + LOOK_FOR_GMP_LIB + LOOK_FOR_GMP_FRAMEWORK + fi fi if test "$HaveFrameworkGMP" = "YES" || test "$HaveLibGmp" = "YES" then diff --git a/libraries/integer-gmp/gmp/ghc.mk b/libraries/integer-gmp/gmp/ghc.mk index b39f36afdf..227b52b04a 100644 --- a/libraries/integer-gmp/gmp/ghc.mk +++ b/libraries/integer-gmp/gmp/ghc.mk @@ -33,6 +33,12 @@ clean_gmp: $(call removeTrees,libraries/integer-gmp/gmp/gmpbuild) endif +ifeq "$(Windows)" "YES" +# Apparently building on Windows fails when there is a system gmp +# available, so we never try to use the system gmp on Windows +libraries/integer-gmp_dist-install_CONFIGURE_OPTS += --configure-option=--with-intree-gmp +endif + ifeq "$(phase)" "final" ifeq "$(findstring clean,$(MAKECMDGOALS))" "" diff --git a/libraries/integer-gmp/gmp/ln b/libraries/integer-gmp/gmp/ln index a3a297ccdb..a3a297ccdb 100644..100755 --- a/libraries/integer-gmp/gmp/ln +++ b/libraries/integer-gmp/gmp/ln |