summaryrefslogtreecommitdiff
path: root/libraries/integer-gmp/gmp
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-02-09 21:55:20 +0000
committerIan Lynagh <ian@well-typed.com>2013-02-09 21:55:20 +0000
commit1b91e7057f674be469c582b718f6a0b1d33e78ab (patch)
tree3569d479d4f29407c32bd332d2b4adc895d89d20 /libraries/integer-gmp/gmp
parent916be615048cc844498319f4a21cc62bec162cd8 (diff)
downloadhaskell-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/integer-gmp/gmp')
-rw-r--r--libraries/integer-gmp/gmp/ghc.mk6
-rwxr-xr-x[-rw-r--r--]libraries/integer-gmp/gmp/ln0
2 files changed, 6 insertions, 0 deletions
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