diff options
| -rw-r--r-- | lldb/lldb.xcodeproj/project.pbxproj | 236 | ||||
| -rw-r--r-- | lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj | 150 | 
2 files changed, 318 insertions, 68 deletions
diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj index d69ef328012..5e84fb4530c 100644 --- a/lldb/lldb.xcodeproj/project.pbxproj +++ b/lldb/lldb.xcodeproj/project.pbxproj @@ -8334,7 +8334,7 @@  				LLVM_BUILD_DIR_ARCH = "$(CURRENT_ARCH)/";  				LLVM_CONFIGURATION = "Release+Asserts";  				LLVM_SOURCE_DIR = "$(SRCROOT)/llvm"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				ONLY_ACTIVE_ARCH = YES;  				OTHER_CFLAGS = (  					"-Wparentheses", @@ -8425,7 +8425,7 @@  				LLVM_BUILD_DIR_ARCH = "$(CURRENT_ARCH)/";  				LLVM_CONFIGURATION = "Release+Asserts";  				LLVM_SOURCE_DIR = "$(SRCROOT)/llvm"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				ONLY_ACTIVE_ARCH = YES;  				OTHER_CFLAGS = (  					"-Wparentheses", @@ -8996,7 +8996,15 @@  					Foundation,  				);  				PRODUCT_NAME = LLDB; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = Debug; @@ -9069,7 +9077,15 @@  					Foundation,  				);  				PRODUCT_NAME = LLDB; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = Release; @@ -9184,7 +9200,15 @@  				PRODUCT_NAME = "lib$(TARGET_NAME)";  				SKIP_INSTALL = YES;  				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = static; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = Debug; @@ -9243,7 +9267,15 @@  				PRODUCT_NAME = "lib$(TARGET_NAME)";  				SKIP_INSTALL = YES;  				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = static; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = Release; @@ -9302,7 +9334,15 @@  				PRODUCT_NAME = "lib$(TARGET_NAME)";  				SKIP_INSTALL = YES;  				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = static; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = BuildAndIntegration; @@ -9379,7 +9419,7 @@  				LLVM_BUILD_DIR_ARCH = "$(CURRENT_ARCH)/";  				LLVM_CONFIGURATION = Release;  				LLVM_SOURCE_DIR = "$(SRCROOT)/llvm"; -				MACOSX_DEPLOYMENT_TARGET = ""; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"-Wparentheses",  					"$(LLDB_ZLIB_CFLAGS)", @@ -9439,7 +9479,12 @@  				);  				PRODUCT_NAME = lldb;  				STRIP_INSTALLED_PRODUCT = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = BuildAndIntegration; @@ -9514,7 +9559,15 @@  				);  				PRODUCT_NAME = LLDB;  				STRIP_INSTALLED_PRODUCT = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = BuildAndIntegration; @@ -9551,7 +9604,15 @@  				);  				PRODUCT_NAME = "$(TARGET_NAME)";  				SDKROOT = macosx; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = Debug; @@ -9588,7 +9649,15 @@  				);  				PRODUCT_NAME = "$(TARGET_NAME)";  				SDKROOT = macosx; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = DebugClang; @@ -9621,7 +9690,15 @@  				);  				PRODUCT_NAME = "$(TARGET_NAME)";  				SDKROOT = macosx; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = Release; @@ -9669,7 +9746,15 @@  				PRODUCT_NAME = "$(TARGET_NAME)";  				SDKROOT = macosx;  				STRIP_INSTALLED_PRODUCT = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = BuildAndIntegration; @@ -9815,7 +9900,15 @@  				);  				PRODUCT_NAME = "lldb-server";  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  			};  			name = Debug;  		}; @@ -9886,7 +9979,15 @@  				);  				PRODUCT_NAME = "lldb-server";  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  			};  			name = Release;  		}; @@ -9958,7 +10059,15 @@  				PRODUCT_NAME = "lldb-server";  				SKIP_INSTALL = YES;  				STRIP_INSTALLED_PRODUCT = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  			};  			name = BuildAndIntegration;  		}; @@ -9987,7 +10096,12 @@  					"-Wl,-rpath,@loader_path",  				);  				PRODUCT_NAME = lldb; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = Debug; @@ -10015,7 +10129,12 @@  					"-Wl,-rpath,@loader_path",  				);  				PRODUCT_NAME = lldb; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = Release; @@ -10094,7 +10213,7 @@  				LLVM_BUILD_DIR_ARCH = "$(CURRENT_ARCH)/";  				LLVM_CONFIGURATION = "Debug+Asserts";  				LLVM_SOURCE_DIR = "$(SRCROOT)/llvm"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				ONLY_ACTIVE_ARCH = YES;  				OTHER_CFLAGS = (  					"-Wparentheses", @@ -10167,7 +10286,12 @@  					"-Wl,-rpath,@loader_path",  				);  				PRODUCT_NAME = lldb; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = DebugClang; @@ -10240,7 +10364,15 @@  					Foundation,  				);  				PRODUCT_NAME = LLDB; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = DebugClang; @@ -10312,7 +10444,15 @@  				PRODUCT_NAME = "lib$(TARGET_NAME)";  				SKIP_INSTALL = YES;  				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = static; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  				VERSIONING_SYSTEM = "apple-generic";  			};  			name = DebugClang; @@ -10386,7 +10526,15 @@  				);  				PRODUCT_NAME = "lldb-server";  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  			};  			name = DebugClang;  		}; @@ -10476,7 +10624,15 @@  				PRODUCT_NAME = "$(TARGET_NAME)";  				SDKROOT = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  			};  			name = Debug;  		}; @@ -10542,7 +10698,15 @@  				PRODUCT_NAME = "$(TARGET_NAME)";  				SDKROOT = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  			};  			name = DebugClang;  		}; @@ -10605,7 +10769,15 @@  				PRODUCT_NAME = "$(TARGET_NAME)";  				SDKROOT = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  			};  			name = Release;  		}; @@ -10671,7 +10843,15 @@  				SDKROOT = macosx;  				SKIP_INSTALL = YES;  				STRIP_INSTALLED_PRODUCT = YES; -				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM"; +				USER_HEADER_SEARCH_PATHS = ( +					"$(SRCROOT)/include", +					"$(SRCROOT)/source", +					"$(LLVM_SOURCE_DIR)/include", +					"$(LLVM_SOURCE_DIR)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include", +					"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM", +				);  			};  			name = BuildAndIntegration;  		}; diff --git a/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj b/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj index 6a919cfef5d..26f5dbea464 100644 --- a/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj +++ b/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj @@ -712,15 +712,15 @@  				GCC_WARN_UNINITIALIZED_AUTOS = YES;  				GCC_WARN_UNUSED_FUNCTION = YES;  				GCC_WARN_UNUSED_VARIABLE = YES; -				LLDB_COMPRESSION_CFLAGS = ""; +				LLDB_COMPRESSION_CFLAGS = "-DHAVE_LIBCOMPRESSION=1";  				"LLDB_COMPRESSION_CFLAGS[sdk=macosx10.11]" = "-DHAVE_LIBCOMPRESSION=1"; -				LLDB_COMPRESSION_LDFLAGS = ""; -				"LLDB_COMPRESSION_LDFLAGS[sdk=macosx10.11]" = "-weak-lcompression"; +				LLDB_COMPRESSION_LDFLAGS = "-lcompression"; +				"LLDB_COMPRESSION_LDFLAGS[sdk=macosx10.11]" = "-lcompression";  				LLDB_OS_LOG_CFLAGS = "-DLLDB_USE_OS_LOG=$(LLDB_USE_OS_LOG)";  				LLDB_USE_OS_LOG = 0;  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.10; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				ONLY_ACTIVE_ARCH = YES;  				OTHER_CFLAGS = "";  				STRIP_INSTALLED_PRODUCT = NO; @@ -756,15 +756,15 @@  				GCC_WARN_UNINITIALIZED_AUTOS = YES;  				GCC_WARN_UNUSED_FUNCTION = YES;  				GCC_WARN_UNUSED_VARIABLE = YES; -				LLDB_COMPRESSION_CFLAGS = ""; +				LLDB_COMPRESSION_CFLAGS = "-DHAVE_LIBCOMPRESSION=1";  				"LLDB_COMPRESSION_CFLAGS[sdk=macosx10.11]" = "-DHAVE_LIBCOMPRESSION=1"; -				LLDB_COMPRESSION_LDFLAGS = ""; -				"LLDB_COMPRESSION_LDFLAGS[sdk=macosx10.11]" = "-weak-lcompression"; +				LLDB_COMPRESSION_LDFLAGS = "-lcompression"; +				"LLDB_COMPRESSION_LDFLAGS[sdk=macosx10.11]" = "-lcompression";  				LLDB_OS_LOG_CFLAGS = "-DLLDB_USE_OS_LOG=$(LLDB_USE_OS_LOG)";  				LLDB_USE_OS_LOG = 0;  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.10; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				ONLY_ACTIVE_ARCH = YES;  				OTHER_CFLAGS = "";  				STRIPFLAGS = "-x"; @@ -798,15 +798,15 @@  				GCC_WARN_UNINITIALIZED_AUTOS = YES;  				GCC_WARN_UNUSED_FUNCTION = YES;  				GCC_WARN_UNUSED_VARIABLE = YES; -				LLDB_COMPRESSION_CFLAGS = ""; +				LLDB_COMPRESSION_CFLAGS = "-DHAVE_LIBCOMPRESSION=1";  				"LLDB_COMPRESSION_CFLAGS[sdk=macosx10.11]" = "-DHAVE_LIBCOMPRESSION=1"; -				LLDB_COMPRESSION_LDFLAGS = ""; -				"LLDB_COMPRESSION_LDFLAGS[sdk=macosx10.11]" = "-weak-lcompression"; +				LLDB_COMPRESSION_LDFLAGS = "-lcompression"; +				"LLDB_COMPRESSION_LDFLAGS[sdk=macosx10.11]" = "-lcompression";  				LLDB_OS_LOG_CFLAGS = "-DLLDB_USE_OS_LOG=$(LLDB_USE_OS_LOG)";  				LLDB_USE_OS_LOG = 1;  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.10; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = "";  				STRIPFLAGS = "-x";  				STRIP_STYLE = debugging; @@ -858,7 +858,7 @@  				"LLDB_ENERGY_LFLAGS[sdk=macosx*]" = "-weak-lpmenergy -weak-lpmsample";  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"-Wparentheses",  					"$(LLDB_ENERGY_CFLAGS)", @@ -910,7 +910,12 @@  				SKIP_INSTALL = YES;  				"SKIP_INSTALL[sdk=iphoneos*]" = NO;  				STRIP_INSTALLED_PRODUCT = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = BuildAndIntegration; @@ -957,7 +962,7 @@  				"LLDB_ENERGY_LFLAGS[sdk=macosx.internal]" = "-weak-lpmenergy -weak-lpmsample";  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"-Wparentheses",  					"$(LLDB_ENERGY_CFLAGS)", @@ -1009,7 +1014,12 @@  				"SDKROOT[arch=x86_64]" = macosx;  				"SDKROOT[arch=x86_64h]" = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = Debug; @@ -1055,7 +1065,7 @@  				"LLDB_ENERGY_LFLAGS[sdk=macosx.internal]" = "-weak-lpmenergy -weak-lpmsample";  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"-Wparentheses",  					"$(LLDB_ENERGY_CFLAGS)", @@ -1107,7 +1117,12 @@  				"SDKROOT[arch=x86_64]" = macosx;  				"SDKROOT[arch=x86_64h]" = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = Release; @@ -1162,7 +1177,7 @@  				"LLDB_ENERGY_LFLAGS[sdk=macosx.internal]" = "-weak-lpmenergy -weak-lpmsample";  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				ONLY_ACTIVE_ARCH = YES;  				OTHER_CFLAGS = "";  				"OTHER_CFLAGS[sdk=iphoneos*][arch=*]" = ( @@ -1194,7 +1209,12 @@  				"SDKROOT[arch=x86_64h]" = macosx;  				SKIP_INSTALL = YES;  				STRIP_INSTALLED_PRODUCT = NO; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				VERSIONING_SYSTEM = "apple-generic";  				VERSION_INFO_BUILDER = "$(USER)";  				ZERO_LINK = NO; @@ -1229,7 +1249,7 @@  				"LLDB_ENERGY_CFLAGS[sdk=macosx.internal]" = "-DLLDB_ENERGY";  				LLDB_ENERGY_LFLAGS = "";  				"LLDB_ENERGY_LFLAGS[sdk=macosx.internal]" = "-weak-lpmenergy -weak-lpmsample"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"$(LLDB_COMPRESSION_CFLAGS)",  					"$(LLDB_ZLIB_CFLAGS)", @@ -1265,7 +1285,12 @@  				"SDKROOT[arch=x86_64]" = macosx;  				"SDKROOT[arch=x86_64h]" = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = DebugClang; @@ -1298,7 +1323,7 @@  				"LLDB_ENERGY_CFLAGS[sdk=macosx.internal]" = "-DLLDB_ENERGY";  				LLDB_ENERGY_LFLAGS = "";  				"LLDB_ENERGY_LFLAGS[sdk=macosx.internal]" = "-weak-lpmenergy -weak-lpmsample"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"$(LLDB_COMPRESSION_CFLAGS)",  					"$(LLDB_ZLIB_CFLAGS)", @@ -1337,7 +1362,12 @@  				"SDKROOT[arch=x86_64]" = macosx;  				"SDKROOT[arch=x86_64h]" = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = Release; @@ -1371,7 +1401,7 @@  				"LLDB_ENERGY_CFLAGS[sdk=macosx*]" = "-DLLDB_ENERGY";  				LLDB_ENERGY_LFLAGS = "";  				"LLDB_ENERGY_LFLAGS[sdk=macosx*]" = "-weak-lpmenergy -weak-lpmsample"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"-Wparentheses",  					"$(LLDB_ENERGY_CFLAGS)", @@ -1403,7 +1433,12 @@  				SKIP_INSTALL = YES;  				"SKIP_INSTALL[sdk=iphoneos*]" = NO;  				STRIP_INSTALLED_PRODUCT = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = BuildAndIntegration; @@ -1436,9 +1471,11 @@  				GCC_WARN_UNINITIALIZED_AUTOS = YES;  				GCC_WARN_UNUSED_FUNCTION = YES;  				GCC_WARN_UNUSED_VARIABLE = YES; +				LLDB_COMPRESSION_CFLAGS = "-DHAVE_LIBCOMPRESSION=1"; +				LLDB_COMPRESSION_LDFLAGS = "-lcompression";  				LLDB_OS_LOG_CFLAGS = "-DLLDB_USE_OS_LOG=$(LLDB_USE_OS_LOG)";  				LLDB_USE_OS_LOG = 0; -				MACOSX_DEPLOYMENT_TARGET = 10.10; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				ONLY_ACTIVE_ARCH = YES;  				SDKROOT = macosx.internal;  				"SDKROOT[arch=i386]" = macosx; @@ -1492,7 +1529,7 @@  				"LLDB_ENERGY_LFLAGS[sdk=macosx.internal]" = "-weak-lpmenergy -weak-lpmsample";  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"-Wparentheses",  					"$(LLDB_ENERGY_CFLAGS)", @@ -1543,7 +1580,12 @@  				"SDKROOT[arch=x86_64]" = macosx;  				"SDKROOT[arch=x86_64h]" = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = DebugClang; @@ -1576,9 +1618,11 @@  				GCC_WARN_UNINITIALIZED_AUTOS = YES;  				GCC_WARN_UNUSED_FUNCTION = YES;  				GCC_WARN_UNUSED_VARIABLE = YES; +				LLDB_COMPRESSION_CFLAGS = "-DHAVE_LIBCOMPRESSION=1"; +				LLDB_COMPRESSION_LDFLAGS = "-lcompression";  				LLDB_OS_LOG_CFLAGS = "-DLLDB_USE_OS_LOG=$(LLDB_USE_OS_LOG)";  				LLDB_USE_OS_LOG = 0; -				MACOSX_DEPLOYMENT_TARGET = 10.10; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				ONLY_ACTIVE_ARCH = YES;  				SDKROOT = macosx.internal;  				"SDKROOT[arch=i386]" = macosx; @@ -1632,7 +1676,7 @@  				"LLDB_ENERGY_LFLAGS[sdk=macosx.internal]" = "-weak-lpmenergy -weak-lpmsample";  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"-Wparentheses",  					"$(LLDB_ENERGY_CFLAGS)", @@ -1682,7 +1726,12 @@  				"SDKROOT[arch=x86_64]" = macosx;  				"SDKROOT[arch=x86_64h]" = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = DebugPresubmission; @@ -1715,7 +1764,7 @@  				"LLDB_ENERGY_CFLAGS[sdk=macosx.internal]" = "-DLLDB_ENERGY";  				LLDB_ENERGY_LFLAGS = "";  				"LLDB_ENERGY_LFLAGS[sdk=macosx.internal]" = "-weak-lpmenergy -weak-lpmsample"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"-Wparentheses",  					"$(LLDB_ENERGY_CFLAGS)", @@ -1749,7 +1798,12 @@  				"SDKROOT[arch=x86_64]" = macosx;  				"SDKROOT[arch=x86_64h]" = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = DebugPresubmission; @@ -1757,6 +1811,7 @@  		94BA9B361B1A7C5700035A23 /* CustomSwift-Debug */ = {  			isa = XCBuildConfiguration;  			buildSettings = { +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				PRODUCT_NAME = "lldb-debugserver-nonui";  			};  			name = "CustomSwift-Debug"; @@ -1764,6 +1819,7 @@  		94BA9B371B1A7C5700035A23 /* CustomSwift-Release */ = {  			isa = XCBuildConfiguration;  			buildSettings = { +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				PRODUCT_NAME = "lldb-debugserver-nonui";  			};  			name = "CustomSwift-Release"; @@ -1796,9 +1852,11 @@  				GCC_WARN_UNINITIALIZED_AUTOS = YES;  				GCC_WARN_UNUSED_FUNCTION = YES;  				GCC_WARN_UNUSED_VARIABLE = YES; +				LLDB_COMPRESSION_CFLAGS = "-DHAVE_LIBCOMPRESSION=1"; +				LLDB_COMPRESSION_LDFLAGS = "-lcompression";  				LLDB_OS_LOG_CFLAGS = "-DLLDB_USE_OS_LOG=$(LLDB_USE_OS_LOG)";  				LLDB_USE_OS_LOG = 0; -				MACOSX_DEPLOYMENT_TARGET = 10.10; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				ONLY_ACTIVE_ARCH = YES;  				SDKROOT = macosx.internal;  				"SDKROOT[arch=i386]" = macosx; @@ -1842,7 +1900,7 @@  				"LLDB_ENERGY_LFLAGS[sdk=macosx.internal]" = "-weak-lpmenergy -weak-lpmsample";  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"-Wparentheses",  					"$(LLDB_ENERGY_CFLAGS)", @@ -1894,7 +1952,12 @@  				"SDKROOT[arch=x86_64]" = macosx;  				"SDKROOT[arch=x86_64h]" = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = "CustomSwift-Debug"; @@ -1926,9 +1989,11 @@  				GCC_WARN_UNINITIALIZED_AUTOS = YES;  				GCC_WARN_UNUSED_FUNCTION = YES;  				GCC_WARN_UNUSED_VARIABLE = YES; +				LLDB_COMPRESSION_CFLAGS = "-DHAVE_LIBCOMPRESSION=1"; +				LLDB_COMPRESSION_LDFLAGS = "-lcompression";  				LLDB_OS_LOG_CFLAGS = "-DLLDB_USE_OS_LOG=$(LLDB_USE_OS_LOG)";  				LLDB_USE_OS_LOG = 0; -				MACOSX_DEPLOYMENT_TARGET = 10.10; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				ONLY_ACTIVE_ARCH = YES;  				SDKROOT = macosx.internal;  				"SDKROOT[arch=i386]" = macosx; @@ -1973,7 +2038,7 @@  				"LLDB_ENERGY_LFLAGS[sdk=macosx.internal]" = "-weak-lpmenergy -weak-lpmsample";  				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";  				LLDB_ZLIB_LDFLAGS = "-lz"; -				MACOSX_DEPLOYMENT_TARGET = 10.9; +				MACOSX_DEPLOYMENT_TARGET = 10.11;  				OTHER_CFLAGS = (  					"-Wparentheses",  					"$(LLDB_ENERGY_CFLAGS)", @@ -2024,7 +2089,12 @@  				"SDKROOT[arch=x86_64]" = macosx;  				"SDKROOT[arch=x86_64h]" = macosx;  				SKIP_INSTALL = YES; -				USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR) ../../include"; +				USER_HEADER_SEARCH_PATHS = ( +					./source, +					../../source, +					"$(DERIVED_SOURCES_DIR)", +					../../include, +				);  				ZERO_LINK = NO;  			};  			name = "CustomSwift-Release";  | 

