diff options
author | Ian Lynagh <ian@well-typed.com> | 2013-03-01 22:29:19 +0000 |
---|---|---|
committer | Ian Lynagh <ian@well-typed.com> | 2013-03-01 22:31:22 +0000 |
commit | dd9da49ceda5bd0d6c860604ace0ca9829199fe5 (patch) | |
tree | df23215803829e60750ec4666987a9d256f7655d | |
parent | ffb2a8c216ad8791422008cc92c8048f4528bbf4 (diff) | |
download | haskell-dd9da49ceda5bd0d6c860604ace0ca9829199fe5.tar.gz |
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.
-rw-r--r-- | ghc.mk | 6 | ||||
-rw-r--r-- | mk/project.mk.in | 7 |
2 files changed, 12 insertions, 1 deletions
@@ -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 diff --git a/mk/project.mk.in b/mk/project.mk.in index df845c613a..e47663fcdb 100644 --- a/mk/project.mk.in +++ b/mk/project.mk.in @@ -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 |