summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Seipp <austin@well-typed.com>2014-02-19 16:39:50 -0600
committerAustin Seipp <austin@well-typed.com>2014-02-19 16:39:54 -0600
commit2b34947b60069e51abfcada9c45a6d7b590f5a2b (patch)
treefa14b11195617bdf04246032c394f19faeb6de01
parente75ebc487b68a07bd632b51df62d9047c559f19f (diff)
downloadhaskell-2b34947b60069e51abfcada9c45a6d7b590f5a2b.tar.gz
Clear up docs regarding LLVM backend (#8792)
Signed-off-by: Austin Seipp <austin@well-typed.com>
-rw-r--r--docs/users_guide/codegens.xml20
m---------libraries/primitive0
2 files changed, 11 insertions, 9 deletions
diff --git a/docs/users_guide/codegens.xml b/docs/users_guide/codegens.xml
index f854e1137e..2eb9408c6c 100644
--- a/docs/users_guide/codegens.xml
+++ b/docs/users_guide/codegens.xml
@@ -41,22 +41,24 @@
<command>opt</command>and <command>llc</command> tools. Secondly, if you
are running Mac OS X with LLVM 3.0 or greater then
you also need the <ulink url="http://clang.llvm.org">Clang c
- compiler</ulink> compiler available on your PATH. Clang and LLVM are
- both included with OS X by default from 10.6 onwards.
+ compiler</ulink> compiler available on your PATH.
</para>
<para>To install LLVM and Clang:
<itemizedlist>
<listitem><emphasis>Linux</emphasis>: Use your package management tool.
</listitem>
- <listitem><emphasis>Mac OS X</emphasis>: LLVM and Clang are included by
- default from <literal>10.6</literal> and later. For
- <literal>10.5</literal> you should install the
- <ulink url="http://mxcl.github.com/homebrew/">Homebrew</ulink> package
- manager for OS X. Alternatively you can download binaries for LLVM
- and Clang from
- <ulink url="http://llvm.org/releases/download.html">here</ulink>.
+ <listitem><emphasis>Mac OS X</emphasis>: Clang is included by
+ default on recent OS X machines when XCode is installed (from
+ <literal>10.6</literal> and later). LLVM is not included. In
+ order to use the LLVM based code generator, you should install
+ the <ulink
+ url="http://mxcl.github.com/homebrew/">Homebrew</ulink>
+ package manager for OS X. Alternatively you can download
+ binaries for LLVM and Clang from <ulink
+ url="http://llvm.org/releases/download.html">here</ulink>.
</listitem>
+
<listitem><emphasis>Windows</emphasis>: You should download binaries for
LLVM and clang from
<ulink url="http://llvm.org/releases/download.html">here</ulink>.
diff --git a/libraries/primitive b/libraries/primitive
-Subproject be63ee15d961dc1b08bc8853b9ff97708551ef3
+Subproject 5ae8fbb8131ccc934cadd29cc1d17298cfdaef4