Ship xhtml, terminfo, haskeline (#8919)
authorJens Petersen <petersen@redhat.com>
Mon, 9 Jun 2014 13:19:08 +0000 (08:19 -0500)
committerAustin Seipp <austin@well-typed.com>
Mon, 9 Jun 2014 13:19:30 +0000 (08:19 -0500)
Signed-off-by: Austin Seipp <austin@well-typed.com>
ghc.mk

diff --git a/ghc.mk b/ghc.mk
index 76eab17..3beab67 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -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