summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/Makefile4
-rwxr-xr-xlldb/www/build.html10
2 files changed, 6 insertions, 8 deletions
diff --git a/lldb/Makefile b/lldb/Makefile
index ea15a11d504..6086353ed0e 100644
--- a/lldb/Makefile
+++ b/lldb/Makefile
@@ -57,10 +57,6 @@ endif
# We can revisit this when LLVM/Clang support it.
CXX.Flags += -fno-strict-aliasing
-# Use c++11 and libc++ and it's headers, instead of gnu's libstdcpp
-CXX.Flags += -std=c++11
-CXX.Flags += -stdlib=libc++
-
# Do not warn about pragmas. In particular, we are looking to ignore the
# "#pragma mark" construct which GCC warns about on platforms other than Darwin.
EXTRA_OPTIONS += -Wno-unknown-pragmas
diff --git a/lldb/www/build.html b/lldb/www/build.html
index 70e7fc0044e..4cd0e723b18 100755
--- a/lldb/www/build.html
+++ b/lldb/www/build.html
@@ -115,12 +115,14 @@
<code>&gt; cd $llvm/..
<br>&gt; mkdir build
<br>&gt; cd build
- <br>&gt; $llvm/configure --enable-targets=x86 --enable-jit
- <br>&gt; make</code>
+ <br>&gt; $llvm/configure --enable-targets=x86 --enable-jit --enable-libcpp
+ <br>&gt; make CXXFLAGS+=c++11</code>
<p>Note that once both LLVM and Clang have been configured and built it is not
necessary to perform a top-level <tt>make</tt> to rebuild changes made only to LLDB.
- You can build from the <tt>build/tools/lldb</tt> subdirectory as well.</p>
+ You can build from the <tt>build/tools/lldb</tt> subdirectory as well. If your
+ compiler doesn't support c++11 or libc++, you may need to tweak or remove the last
+ parameter to the configure script and make command.</p>
<h2>Additional Notes</h2>
<p>LLDB has a Python scripting capability and supplies it&#8217;s own Python module,
@@ -141,4 +143,4 @@
</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
OpenPOWER on IntegriCloud