[commit: ghc] master: Clear up docs regarding LLVM backend (#8792) (2b34947)
git at git.haskell.org
git at git.haskell.org
Wed Feb 19 22:40:42 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/2b34947b60069e51abfcada9c45a6d7b590f5a2b/ghc
>---------------------------------------------------------------
commit 2b34947b60069e51abfcada9c45a6d7b590f5a2b
Author: Austin Seipp <austin at well-typed.com>
Date: Wed Feb 19 16:39:50 2014 -0600
Clear up docs regarding LLVM backend (#8792)
Signed-off-by: Austin Seipp <austin at well-typed.com>
>---------------------------------------------------------------
2b34947b60069e51abfcada9c45a6d7b590f5a2b
docs/users_guide/codegens.xml | 20 +++++++++++---------
libraries/primitive | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/docs/users_guide/codegens.xml b/docs/users_guide/codegens.xml
index f854e11..2eb9408 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
index be63ee1..5ae8fbb 160000
--- a/libraries/primitive
+++ b/libraries/primitive
@@ -1 +1 @@
-Subproject commit be63ee15d961dc1b08bc8853b9ff97708551ef36
+Subproject commit 5ae8fbb8131ccc934cadd29cc1d17298cfdaef4b
More information about the ghc-commits
mailing list