[Lldb-commits] [lldb] r107853 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj llvm.zip scripts/build-llvm.pl

[Sean Callanan]

Author: spyffe
Date: Wed Jul  7 21:13:18 2010
New Revision: 107853

URL: http://llvm.org/viewvc/llvm-project?rev=107853&view=rev
Log:
Updated to build against the latest LLVM release.
Also fixed our build to define NDEBUG; code that
uses LLVM headers without NDEBUG is
binary-incompatible with libraries built with
NDEBUG.

Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/llvm.zip
    lldb/trunk/scripts/build-llvm.pl

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=107853&r1=107852&r2=107853&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Wed Jul  7 21:13:18 2010
@@ -2753,8 +2753,9 @@
 					"$(LLVM_BUILD_DIR)",
 				);
 				LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
-				LLVM_CONFIGURATION = Debug;
+				LLVM_CONFIGURATION = Release;
 				OTHER_CFLAGS = (
+					"-DNDEBUG",
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",
 					"-Wparentheses",
@@ -2808,6 +2809,7 @@
 				LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
 				LLVM_CONFIGURATION = Release;
 				OTHER_CFLAGS = (
+					"-DNDEBUG",
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",
 					"-Wparentheses",
@@ -2917,6 +2919,7 @@
 				LLVM_BUILD_DIR = "$(DERIVED_FILE_DIR)/llvm.build";
 				LLVM_CONFIGURATION = Release;
 				OTHER_CFLAGS = (
+					"-DNDEBUG",
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",
 					"-Wparentheses",

Modified: lldb/trunk/llvm.zip
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/llvm.zip?rev=107853&r1=107852&r2=107853&view=diff
==============================================================================
Binary files - no diff available.

Modified: lldb/trunk/scripts/build-llvm.pl
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/build-llvm.pl?rev=107853&r1=107852&r2=107853&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Wed Jul  7 21:13:18 2010
@@ -25,7 +25,7 @@
 
 our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
 
-our $llvm_revision = "'{2010-07-02T08:00}'";
+our $llvm_revision = "'{2010-07-07T08:00}'";
 our $llvm_source_dir = "$ENV{SRCROOT}";
 our $cc = "$ENV{DEVELOPER_BIN_DIR}/gcc-4.2";
 our $cxx = "$ENV{DEVELOPER_BIN_DIR}/g++-4.2";
@@ -225,7 +225,7 @@
 			# Build llvm and clang
 	        print "Configuring clang ($arch) in '$llvm_dstroot_arch'...\n";
 			my $lldb_configuration_options = '';
-			$llvm_configuration eq 'Release' and $lldb_configuration_options .= '--enable-optimized';
+			$llvm_configuration eq 'Release' and $lldb_configuration_options .= '--enable-optimized --disable-assertions';
 	        do_command ("cd '$llvm_dstroot_arch' && '$llvm_source_dir/llvm/configure' $lldb_configuration_options --enable-targets=x86,x86_64,arm --build=$arch-apple-darwin10 CC=\"$cc -arch $arch\" CXX=\"$cxx -arch $arch\"",
 	                    "configuring llvm build", 1);			
 		}