Commit dd9da49c authored by ian@well-typed.com's avatar ian@well-typed.com

Fix when terminfo is built; fixes #7700

We now use the 'host' to determine whether stage0 builds terminfo,
and 'target' to determine whether stage1 does.

We don't build it if the platform is either Windows or ios.
parent ffb2a8c2
......@@ -351,8 +351,10 @@ else
PACKAGES_STAGE0 = Cabal/Cabal hpc bin-package-db hoopl transformers
ifeq "$(Windows_Host)" "NO"
ifneq "$(HostOS_CPP)" "ios"
PACKAGES_STAGE0 += terminfo
endif
endif
PACKAGES_STAGE1 += ghc-prim
PACKAGES_STAGE1 += $(INTEGER_LIBRARY)
......@@ -397,9 +399,11 @@ endif
REGULAR_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2))
PACKAGES_STAGE1 += xhtml
ifeq "$(Windows_Host)" "NO"
ifeq "$(Windows_Target)" "NO"
ifneq "$(TargetOS_CPP)" "ios"
PACKAGES_STAGE1 += terminfo
endif
endif
PACKAGES_STAGE1 += haskeline
# If we have built the programs with dynamic libraries, then
......
......@@ -135,6 +135,13 @@ else
Windows_Host=NO
endif
# Windows_Target=YES if we are targetting a Windows platform
ifneq "$(findstring $(TargetOS_CPP), mingw32 cygwin32)" ""
Windows_Target=YES
else
Windows_Target=NO
endif
# Tell the build system what the host operating system is
# This distinguishes "msys" and "cygwin", which are not
# not distinguished by HOST_OS_CPP
......
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