Author: tfiala
Date: Thu Jan 28 02:16:18 2016
New Revision: 259028
URL: http://llvm.org/viewvc/llvm-project?rev=259028&view=rev
Log:
fixed Xcode gtest build failure
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=259028&r1=259027&r2=259028&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Thu Jan 28 02:16:18 2016
@@ -7490,7 +7490,7 @@
"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks",
);
LLDB_GTESTS_CFLAGS = "-I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
- LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/$(LLVM_CONFIGURATION)/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l 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 = (
"-flimit-debug-info",
"-Wparentheses",
@@ -7527,7 +7527,7 @@
"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks",
);
LLDB_GTESTS_CFLAGS = "-I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
- LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/$(LLVM_CONFIGURATION)/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l 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 = (
"-flimit-debug-info",
"-Wparentheses",
@@ -7564,7 +7564,7 @@
"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks",
);
LLDB_GTESTS_CFLAGS = "-I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
- LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/$(LLVM_CONFIGURATION)/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l 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 = (
"-flimit-debug-info",
"-Wparentheses",
@@ -7601,7 +7601,7 @@
"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks",
);
LLDB_GTESTS_CFLAGS = "-I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
- LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/$(LLVM_CONFIGURATION)/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l 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 = (
"-flimit-debug-info",
"-Wparentheses",
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
