summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Granata <egranata@apple.com>2016-03-22 20:16:51 +0000
committerEnrico Granata <egranata@apple.com>2016-03-22 20:16:51 +0000
commit0569b5bd6be0c166646692de30d197b00290415b (patch)
tree24af2cc5c9cf928ae2e4b369a47903a9b5dfc8e6
parentcc41495eb809e064a976f93c49a5000c0c8c0a72 (diff)
downloadbcm5719-llvm-0569b5bd6be0c166646692de30d197b00290415b.tar.gz
bcm5719-llvm-0569b5bd6be0c166646692de30d197b00290415b.zip
Changes to the Xcode project file to make LLDB build again after llvm/Support/ConvertUTF.h was brought into the driver
llvm-svn: 264087
-rw-r--r--lldb/lldb.xcodeproj/project.pbxproj10
1 files changed, 4 insertions, 6 deletions
diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj
index e717e3f0c93..a13610fa705 100644
--- a/lldb/lldb.xcodeproj/project.pbxproj
+++ b/lldb/lldb.xcodeproj/project.pbxproj
@@ -8169,7 +8169,7 @@
);
PRODUCT_NAME = lldb;
STRIP_INSTALLED_PRODUCT = YES;
- USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source";
+ 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;
@@ -8708,7 +8708,6 @@
INFOPLIST_FILE = "lldb-Info.plist";
INSTALL_PATH = "$(LLDB_TOOLS_INSTALL_DIR)";
LIBRARY_SEARCH_PATHS = "$(inherited)";
- LLVM_BUILD_DIR_ARCH = "$(OBJROOT)/llvm";
OTHER_LDFLAGS = (
"$(inherited)",
"-sectcreate",
@@ -8718,7 +8717,7 @@
"-Wl,-rpath,@loader_path",
);
PRODUCT_NAME = lldb;
- USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source";
+ 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;
@@ -8746,7 +8745,7 @@
"-Wl,-rpath,@loader_path",
);
PRODUCT_NAME = lldb;
- USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source";
+ 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;
@@ -8884,7 +8883,6 @@
INFOPLIST_FILE = "lldb-Info.plist";
INSTALL_PATH = "$(LLDB_TOOLS_INSTALL_DIR)";
LIBRARY_SEARCH_PATHS = "$(inherited)";
- LLVM_BUILD_DIR_ARCH = "$(OBJROOT)/llvm";
OTHER_LDFLAGS = (
"$(inherited)",
"-sectcreate",
@@ -8894,7 +8892,7 @@
"-Wl,-rpath,@loader_path",
);
PRODUCT_NAME = lldb;
- USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source";
+ 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;
OpenPOWER on IntegriCloud