[Lldb-commits] [lldb] r143713 - /lldb/trunk/lldb.xcodeproj/project.pbxproj

[Greg Clayton]

Author: gclayton
Date: Fri Nov  4 12:36:00 2011
New Revision: 143713

URL: http://llvm.org/viewvc/llvm-project?rev=143713&view=rev
Log:
For "Debug" and "Release" builds, don't build llvm into the $(OBJROOT) since
we often nuke our "build" folder so we can do clean builds. This way if you
are building your own LLVM you won't have to rebuild LLVM when you do remove
your build folder. The new location for the LLVM build is:

lldb/llvm-build


Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=143713&r1=143712&r2=143713&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Nov  4 12:36:00 2011
@@ -3589,7 +3589,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				LLVM_BUILD_DIR = "$(OBJROOT)/llvm";
+				LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)";
 				LLVM_BUILD_DIR_ARCH = "$(CURRENT_ARCH)/";
 				LLVM_CONFIGURATION = "Release+Debug";
 				LLVM_SOURCE_DIR = "$(SRCROOT)/llvm";
@@ -3638,7 +3638,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				LLVM_BUILD_DIR = "$(OBJROOT)/llvm";
+				LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)";
 				LLVM_BUILD_DIR_ARCH = "$(CURRENT_ARCH)/";
 				LLVM_CONFIGURATION = "Release+Debug";
 				LLVM_SOURCE_DIR = "$(SRCROOT)/llvm";
@@ -4068,8 +4068,6 @@
 					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
 					"$(inherited)",
 				);
-				LLVM_CONFIGURATION = Release;
-				"LLVM_CONFIGURATION[sdk=iphoneos*][arch=*]" = "Release+Debug";
 				OTHER_LDFLAGS = (
 					"-lllvmclang",
 					"-lpython",
@@ -4132,8 +4130,6 @@
 					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
 					"$(inherited)",
 				);
-				LLVM_CONFIGURATION = Release;
-				"LLVM_CONFIGURATION[sdk=iphoneos*][arch=*]" = "Release+Debug";
 				OTHER_LDFLAGS = (
 					"-lllvmclang",
 					"-lpython",
@@ -4193,8 +4189,6 @@
 					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
 					"$(inherited)",
 				);
-				LLVM_CONFIGURATION = Release;
-				"LLVM_CONFIGURATION[sdk=iphoneos*][arch=*]" = "Release+Debug";
 				OTHER_LDFLAGS = (
 					"-lllvmclang",
 					"-lpython",
@@ -4239,6 +4233,7 @@
 				INFOPLIST_FILE = "lldb-Info.plist";
 				INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				LLVM_BUILD_DIR_ARCH = "$(OBJROOT)/llvm";
 				OTHER_LDFLAGS = (
 					"-sectcreate",
 					__TEXT,