diff --git a/lldb/Makefile b/lldb/Makefile
index ea15a11d504f..6086353ed0e3 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 70e7fc0044e8..4cd0e723b183 100755
--- a/lldb/www/build.html
+++ b/lldb/www/build.html
@@ -115,12 +115,14 @@
> cd $llvm/..
> mkdir build
> cd build
-
> $llvm/configure --enable-targets=x86 --enable-jit
-
> make
+
> $llvm/configure --enable-targets=x86 --enable-jit --enable-libcpp
+
> make CXXFLAGS+=c++11
Note that once both LLVM and Clang have been configured and built it is not
necessary to perform a top-level make to rebuild changes made only to LLDB.
- You can build from the build/tools/lldb subdirectory as well.
+ You can build from the build/tools/lldb 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.
Additional Notes
LLDB has a Python scripting capability and supplies it’s own Python module,
@@ -141,4 +143,4 @@
-