diff options
| author | Jens Petersen <petersen@redhat.com> | 2014-06-09 08:19:08 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-06-09 08:19:30 -0500 |
| commit | 4caadb7cbee5c176abb99df25c4cc1657ae57f40 (patch) | |
| tree | b869e4192613f8054a66063a96b9ca1f803130c6 /ghc.mk | |
| parent | 877a9577280f4b6aa6ef47f7a27d9b741b8234cf (diff) | |
| download | haskell-4caadb7cbee5c176abb99df25c4cc1657ae57f40.tar.gz | |
Ship xhtml, terminfo, haskeline (#8919)
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -425,13 +425,6 @@ PACKAGES_STAGE2 += haskell98 PACKAGES_STAGE2 += haskell2010 endif -# We normally install only the packages down to this point -REGULAR_INSTALL_PACKAGES := $(addprefix libraries/,$(PACKAGES_STAGE1)) -ifneq "$(Stage1Only)" "YES" -REGULAR_INSTALL_PACKAGES += compiler -endif -REGULAR_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2)) - PACKAGES_STAGE1 += xhtml ifeq "$(Windows_Target)" "NO" ifneq "$(TargetOS_CPP)" "ios" @@ -440,6 +433,13 @@ endif endif PACKAGES_STAGE1 += haskeline +# We normally install only the packages down to this point +REGULAR_INSTALL_PACKAGES := $(addprefix libraries/,$(PACKAGES_STAGE1)) +ifneq "$(Stage1Only)" "YES" +REGULAR_INSTALL_PACKAGES += compiler +endif +REGULAR_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2)) + # If we have built the programs with dynamic libraries, then # ghc will be dynamically linked against haskeline.so etc, so # we need the dynamic libraries of everything down to here |