[Lldb-commits] [lldb] r108289 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj scripts/build-llvm.pl source/Expression/IRForTarget.cpp

[Greg Clayton]

Author: gclayton
Date: Tue Jul 13 17:26:45 2010
New Revision: 108289

URL: http://llvm.org/viewvc/llvm-project?rev=108289&view=rev
Log:
Removed unused variable "log".

Fixed the llvm build for Mac OS X builds to look in llvm/lib/Release+Asserts 
output directory for all configurations (Debug, Release, BuildAndIntegration).


Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/scripts/build-llvm.pl
    lldb/trunk/source/Expression/IRForTarget.cpp

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=108289&r1=108288&r2=108289&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Jul 13 17:26:45 2010
@@ -2756,7 +2756,7 @@
 					"$(LLVM_BUILD_DIR)",
 				);
 				LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
-				LLVM_CONFIGURATION = Release;
+				LLVM_CONFIGURATION = "Release+Asserts";
 				OTHER_CFLAGS = (
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",
@@ -2809,7 +2809,7 @@
 					"$(LLVM_BUILD_DIR)",
 				);
 				LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
-				LLVM_CONFIGURATION = Release;
+				LLVM_CONFIGURATION = "Release+Asserts";
 				OTHER_CFLAGS = (
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",

Modified: lldb/trunk/scripts/build-llvm.pl
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/build-llvm.pl?rev=108289&r1=108288&r2=108289&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Tue Jul 13 17:26:45 2010
@@ -395,6 +395,10 @@
                 print FILES "$archive_fullpath\n";
             }
 		}
+        else
+        {
+            print "warning: archive doesn't exist: '$archive_fullpath'\n";
+        }
 	}
 	close (FILES);
     do_command ("libtool -static -o '$arch_output_file' -filelist '$files'");

Modified: lldb/trunk/source/Expression/IRForTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRForTarget.cpp?rev=108289&r1=108288&r2=108289&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRForTarget.cpp (original)
+++ lldb/trunk/source/Expression/IRForTarget.cpp Tue Jul 13 17:26:45 2010
@@ -86,8 +86,6 @@
                                  llvm::Value *V,
                                  bool Store)
 {
-    lldb_private::Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS);
-
     if (GlobalVariable *global_variable = dyn_cast<GlobalVariable>(V))
     {        
         clang::NamedDecl *named_decl = DeclForGlobalValue(M, global_variable);