diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-11 20:12:36 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-11 23:27:27 +0000 |
| commit | eabd61a476cfe6d546360cd5d0ab0074282a19f7 (patch) | |
| tree | 7f4fef81f73012c27a028790e8a1e542cc5a5a6d /rules/build-package-data.mk | |
| parent | 8aefdc085bea0e20f79d16c417507a36ba2d0f8f (diff) | |
| download | haskell-eabd61a476cfe6d546360cd5d0ab0074282a19f7.tar.gz | |
Update Cabal
Diffstat (limited to 'rules/build-package-data.mk')
| -rw-r--r-- | rules/build-package-data.mk | 13 |
1 files changed, 6 insertions, 7 deletions
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 |