[Lldb-commits] [lldb] r163911 - in /lldb/trunk: Makefile www/build.html

[Filipe Cabecinhas]

Author: filcab
Date: Fri Sep 14 12:09:06 2012
New Revision: 163911

URL: http://llvm.org/viewvc/llvm-project?rev=163911&view=rev
Log:
Don't force libc++ and c++11 on everyone.

Make the flags part of configure and make invocations, for now.

Modified:
    lldb/trunk/Makefile
    lldb/trunk/www/build.html

Modified: lldb/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/Makefile?rev=163911&r1=163910&r2=163911&view=diff
==============================================================================
--- lldb/trunk/Makefile (original)
+++ lldb/trunk/Makefile Fri Sep 14 12:09:06 2012
@@ -57,10 +57,6 @@
 # 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

Modified: lldb/trunk/www/build.html
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/www/build.html?rev=163911&r1=163910&r2=163911&view=diff
==============================================================================
--- lldb/trunk/www/build.html (original)
+++ lldb/trunk/www/build.html Fri Sep 14 12:09:06 2012
@@ -115,12 +115,14 @@
                 <code>> cd $llvm/..
                   <br>> mkdir build
                   <br>> cd build
-                  <br>> $llvm/configure --enable-targets=x86 --enable-jit
-                  <br>> make</code>
+                  <br>> $llvm/configure --enable-targets=x86 --enable-jit --enable-libcpp
+                  <br>> 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’s own Python module,
@@ -141,4 +143,4 @@
 	</div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>