summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2018-04-10 17:49:56 +0000
committerJim Ingham <jingham@apple.com>2018-04-10 17:49:56 +0000
commit7a048da40c4a7c120cc7d7126ec625738bebad33 (patch)
tree8e5985d1f754d3df2d5f329f579c62d0357cd17e
parentc86033a55aa55a8337376986e74e252b19e1a914 (diff)
downloadbcm5719-llvm-7a048da40c4a7c120cc7d7126ec625738bebad33.tar.gz
bcm5719-llvm-7a048da40c4a7c120cc7d7126ec625738bebad33.zip
Fix a typo in the gtest build target for Debug configuration.
I usually run DebugClang... llvm-svn: 329727
-rw-r--r--lldb/lldb.xcodeproj/project.pbxproj2
-rw-r--r--lldb/lldb.xcworkspace/contents.xcworkspacedata3
2 files changed, 1 insertions, 4 deletions
diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj
index 477a5710521..abd7241ee11 100644
--- a/lldb/lldb.xcodeproj/project.pbxproj
+++ b/lldb/lldb.xcodeproj/project.pbxproj
@@ -8818,7 +8818,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- LLDB_GTESTS_CFLAGS = "-I unittests -I $(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I $(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I $(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -DYAML2OBJ=\"\\\"$(LLVM_BUILD_DIR)/x86_64/bin/yaml2obj\\\"\" -I include -I source -I $PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/include/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
+ LLDB_GTESTS_CFLAGS = "-I unittests -I $(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I $(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I $(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -DYAML2OBJ=\"\\\"$(LLVM_BUILD_DIR)/x86_64/bin/yaml2obj\\\"\" -I include -I source -I $(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/include/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
LLDB_GTESTS_LDFLAGS = "$(LLVM_BUILD_DIR)/x86_64/lib/libgtest.a -L $(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib -l python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
OTHER_CFLAGS = (
"-fno-rtti",
diff --git a/lldb/lldb.xcworkspace/contents.xcworkspacedata b/lldb/lldb.xcworkspace/contents.xcworkspacedata
index 3080c5452a7..3266d5b39e2 100644
--- a/lldb/lldb.xcworkspace/contents.xcworkspacedata
+++ b/lldb/lldb.xcworkspace/contents.xcworkspacedata
@@ -2,9 +2,6 @@
<Workspace
version = "1.0">
<FileRef
- location = "group:/Volumes/ThePlayground/Users/jingham/Work/LLDB/llvm-dot-org/lldb-working/unittests/Interpreter/TestOptionArgParser.cpp">
- </FileRef>
- <FileRef
location = "group:lldb.xcodeproj">
</FileRef>
<FileRef
OpenPOWER on IntegriCloud