X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;h=f508b8163aa77b1a5554022b30dbbce6cec2703a;hb=e553a60151dc282c8b8c201871212cba0c3bf2a0;hp=88e2c63171d7a37533c73687fe4ca288868586e6;hpb=e6ca2d4ac1e3d86bd93e5884fbae03151c708862;p=ghc-hetmet.git

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 88e2c63..f508b81 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -25,7 +25,7 @@ $1_$2_CONFIGURE_OPTS += --enable-shared
 endif
 
 ifeq "$$(HSCOLOUR_SRCS)" "YES"
-$1_$2_CONFIGURE_OPTS += --with-hscolour="$$(HSCOLOUR)"
+$1_$2_CONFIGURE_OPTS += --with-hscolour="$$(HSCOLOUR_CMD)"
 endif
 
 # We filter out -Werror from SRC_CC_OPTS, because when configure tests
@@ -42,6 +42,18 @@ ifneq "$$(ICONV_LIB_DIRS)" ""
 $1_$2_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="$$(ICONV_LIB_DIRS)"
 endif
 
+ifneq "$$(GMP_INCLUDE_DIRS)" ""
+$1_$2_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="$$(GMP_INCLUDE_DIRS)"
+endif
+
+ifneq "$$(GMP_LIB_DIRS)" ""
+$1_$2_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="$$(GMP_LIB_DIRS)"
+endif
+
+ifeq "$3" "0"
+$1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS)
+endif
+
 # This rule configures the package, generates the package-data.mk file
 # for our build system, and registers the package for use in-place in
 # the build tree.