From eabd61a476cfe6d546360cd5d0ab0074282a19f7 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <ian@well-typed.com>
Date: Mon, 11 Mar 2013 20:12:36 +0000
Subject: Update Cabal

---
 rules/build-package-data.mk | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'rules')

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 0380f7c5e5..bcd863fe62 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -18,8 +18,14 @@ $(call profStart, build-package-data($1,$2,$3))
 # $2 = distdir
 # $3 = GHC stage to use (0 == bootstrapping compiler)
 
+$1_$2_CONFIGURE_OPTS += --disable-library-for-ghci
 ifeq "$$(filter v,$$($1_$2_WAYS))" "v"
 $1_$2_CONFIGURE_OPTS += --enable-library-vanilla
+ifeq "$$(GhcWithInterpreter)" "YES"
+ifneq "$$(DYNAMIC_BY_DEFAULT)" "YES"
+$1_$2_CONFIGURE_OPTS += --enable-library-for-ghci
+endif
+endif
 else
 $1_$2_CONFIGURE_OPTS += --disable-library-vanilla
 endif
@@ -36,13 +42,6 @@ else
 $1_$2_CONFIGURE_OPTS += --disable-shared
 endif
 
-$1_$2_CONFIGURE_OPTS += --disable-library-for-ghci
-ifeq "$$(GhcWithInterpreter)" "YES"
-ifneq "$$(DYNAMIC_BY_DEFAULT)" "YES"
-$1_$2_CONFIGURE_OPTS += --enable-library-for-ghci
-endif
-endif
-
 ifeq "$$(HSCOLOUR_SRCS)" "YES"
 $1_$2_CONFIGURE_OPTS += --with-hscolour="$$(HSCOLOUR_CMD)"
 endif
-- 
cgit v1.2.1