Merge remote branch 'origin/master'

bakkdoor · Dec 18, 2010 · 15d02f5 · 15d02f5
2 parents 364eba6 + 3b714cd
commit 15d02f5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/web/_site/doc/en/getting-started/building/index.html b/web/_site/doc/en/getting-started/building/index.html
@@ -110,8 +110,11 @@ <h2>Building Rubinius</h2>
 Rubinius and running it from the source directory.</p>
 
 <p>Rubinius uses LLVM for the JIT compiler. Rubinius depends on a particular
-version of LLVM. If you have installed LLVM on your system, pass the
-<code>--skip-system</code> flag to the configure script in the directions below.</p>
+version of LLVM and LLVM must be built with C++ RTTI (run-time type
+information) enabled.  The <code>configure</code> script will automatically verify these
+requirements when searching for an installed version of LLVM. If you do have
+LLVM installed and Rubinius fails to link with it for any reason, pass
+<code>--skip-system</code> to the <code>configure</code> script in the directions below.</p>
 
 <h3 id="getting-the-source">Getting the Source</h3>
 

diff --git a/web/doc/en/getting-started/building.markdown b/web/doc/en/getting-started/building.markdown
@@ -12,8 +12,11 @@ install Rubinius to run it. The directions below will detail both installing
 Rubinius and running it from the source directory.
 
 Rubinius uses LLVM for the JIT compiler. Rubinius depends on a particular
-version of LLVM. If you have installed LLVM on your system, pass the
-`--skip-system` flag to the configure script in the directions below.
+version of LLVM and LLVM must be built with C++ RTTI (run-time type
+information) enabled.  The `configure` script will automatically verify these
+requirements when searching for an installed version of LLVM. If you do have
+LLVM installed and Rubinius fails to link with it for any reason, pass
+`--skip-system` to the `configure` script in the directions below.
 
 ### Getting the Source