Commit 4caadb7c authored by Jens Petersen's avatar Jens Petersen Committed by Austin Seipp
Browse files

Ship xhtml, terminfo, haskeline (#8919)


Signed-off-by: default avatarAustin Seipp <austin@well-typed.com>
parent 877a9577
...@@ -425,13 +425,6 @@ PACKAGES_STAGE2 += haskell98 ...@@ -425,13 +425,6 @@ PACKAGES_STAGE2 += haskell98
PACKAGES_STAGE2 += haskell2010 PACKAGES_STAGE2 += haskell2010
endif 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 PACKAGES_STAGE1 += xhtml
ifeq "$(Windows_Target)" "NO" ifeq "$(Windows_Target)" "NO"
ifneq "$(TargetOS_CPP)" "ios" ifneq "$(TargetOS_CPP)" "ios"
...@@ -440,6 +433,13 @@ endif ...@@ -440,6 +433,13 @@ endif
endif endif
PACKAGES_STAGE1 += haskeline 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 # If we have built the programs with dynamic libraries, then
# ghc will be dynamically linked against haskeline.so etc, so # ghc will be dynamically linked against haskeline.so etc, so
# we need the dynamic libraries of everything down to here # we need the dynamic libraries of everything down to here
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment