Fix GMP_PREFER_FRAMEWORK
authorIan Lynagh <ian@well-typed.com>
Sat, 9 Feb 2013 21:56:25 +0000 (21:56 +0000)
committerIan Lynagh <ian@well-typed.com>
Sat, 9 Feb 2013 21:56:25 +0000 (21:56 +0000)
It doesn't look like the old code could have worked

gmp/ghc.mk

index 227b52b..f6f3539 100644 (file)
@@ -36,7 +36,11 @@ 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
+libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-intree-gmp
+endif
+
+ifeq "$(GMP_PREFER_FRAMEWORK)" "YES"
+libraries/integer-gmp_CONFIGURE_OPTS += --with-gmp-framework-preferred
 endif
 
 ifeq "$(phase)" "final"
@@ -45,10 +49,6 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 include libraries/integer-gmp/gmp/config.mk
 endif
 
-ifeq "$(GMP_PREFER_FRAMEWORK)" "YES"
-libraries/integer-gmp_CC_OPTS += --with-gmp-framework-preferred
-endif
-
 libraries/integer-gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS))
 libraries/integer-gmp_CC_OPTS += $(addprefix -L,$(GMP_LIB_DIRS))