diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-03-25 14:00:26 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-10-03 11:33:20 -0400 |
| commit | 7ce9ead4fddfbffb5cb63cce0f1b4533b7bcc0ad (patch) | |
| tree | a87141d383de4bb147dfdb7ae2a8fb751376d462 | |
| parent | 082ea3124b57883f01e6f84926983921557b11a6 (diff) | |
| download | haskell-7ce9ead4fddfbffb5cb63cce0f1b4533b7bcc0ad.tar.gz | |
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
(cherry picked from commit 10566a814fc07072385fc72c25158d79f25a8a36)
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 45f9c0b925..6d7616e339 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 91eb1c0615..81de9812ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1105,7 +1105,7 @@ case ${TargetOS} in linux|linux-android|freebsd|dragonfly|netbsd|openbsd|kfreebsdgnu|gnu|solaris2) RtsLinkerUseMmap=1 ;; - darwin) + 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 |