Fix when terminfo is built; fixes #7700
authorIan Lynagh <ian@well-typed.com>
Fri, 1 Mar 2013 22:29:19 +0000 (22:29 +0000)
committerIan Lynagh <ian@well-typed.com>
Fri, 1 Mar 2013 22:31:22 +0000 (22:31 +0000)
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.

ghc.mk
mk/project.mk.in

diff --git a/ghc.mk b/ghc.mk
index 1cf5f86..319522a 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -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
index df845c6..e47663f 100644 (file)
@@ -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