From 10566a814fc07072385fc72c25158d79f25a8a36 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 25 Mar 2018 14:00:26 -0400 Subject: Support iOS variants elsewhere when configuring Reviewers: hvr, bgamari, angerman Reviewed By: angerman Subscribers: rwbarton, thomie, erikd, carter, angerman Differential Revision: https://phabricator.haskell.org/D4513 --- aclocal.m4 | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index e19cbf2aa9..b0a3d44cd6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -242,7 +242,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], linux|linux-android) test -z "[$]2" || eval "[$]2=OSLinux" ;; - darwin|ios) + darwin|ios|watchos|tvos) test -z "[$]2" || eval "[$]2=OSDarwin" ;; solaris2) diff --git a/configure.ac b/configure.ac index 1bab56d7fe..111def2cda 100644 --- a/configure.ac +++ b/configure.ac @@ -1190,7 +1190,7 @@ case ${TargetOS} in linux|linux-android|freebsd|dragonfly|netbsd|openbsd|kfreebsdgnu|gnu|solaris2) RtsLinkerUseMmap=1 ;; - darwin|ios) + darwin|ios|watchos|tvos) # Don't use mmap on powerpc/darwin as the mmap there doesn't support # reallocating. Reallocating is needed to allocate jump islands just # after each object image. Jumps to these jump islands use relative -- cgit v1.2.1