Author: jmolenda
Date: Wed Nov  7 10:38:15 2018
New Revision: 346342

URL: http://llvm.org/viewvc/llvm-project?rev=346342&view=rev
Log:
Revert r346285 until I can make it work correctly
the way the bots build lldb.

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=346342&r1=346341&r2=346342&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Wed Nov  7 10:38:15 2018
@@ -8623,22 +8623,9 @@
                                        "-Wimplicit-fallthrough",
                                );
                                OTHER_LDFLAGS = (
-                                       "$(inherited)",
-                                       "-filelist",
-                                       "$(LLVM_BUILD_DIR)/archives.txt",
-                                       "-framework",
-                                       Foundation,
-                                       "-framework",
-                                       DebugSymbols,
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       CoreServices,
-                                       "-framework",
-                                       ApplicationServices,
-                                       "$(LLDB_GTESTS_LDFLAGS)",
-                                       "$(LLDB_ZLIB_LDFLAGS)",
                                        "$(LLDB_COMPRESSION_LDFLAGS)",
+                                       "$(LLDB_ZLIB_LDFLAGS)",
+                                       "$(LLDB_COVERAGE_LDFLAGS)",
                                );
                                PYTHON_FRAMEWORK_PATH = 
/System/Library/Frameworks/Python.framework/;
                                PYTHON_VERSION_MAJOR = 2;
@@ -8726,22 +8713,9 @@
                                        "-Wimplicit-fallthrough",
                                );
                                OTHER_LDFLAGS = (
-                                       "$(inherited)",
-                                       "-filelist",
-                                       "$(LLVM_BUILD_DIR)/archives.txt",
-                                       "-framework",
-                                       Foundation,
-                                       "-framework",
-                                       DebugSymbols,
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       CoreServices,
-                                       "-framework",
-                                       ApplicationServices,
-                                       "$(LLDB_GTESTS_LDFLAGS)",
-                                       "$(LLDB_ZLIB_LDFLAGS)",
                                        "$(LLDB_COMPRESSION_LDFLAGS)",
+                                       "$(LLDB_ZLIB_LDFLAGS)",
+                                       "$(LLDB_COVERAGE_LDFLAGS)",
                                );
                                PYTHON_FRAMEWORK_PATH = 
/System/Library/Frameworks/Python.framework/;
                                PYTHON_VERSION_MAJOR = 2;
@@ -9062,8 +9036,6 @@
                                        "-framework",
                                        ApplicationServices,
                                        "$(LLDB_GTESTS_LDFLAGS)",
-                                       "$(LLDB_ZLIB_LDFLAGS)",
-                                       "$(LLDB_COMPRESSION_LDFLAGS)",
                                );
                                PRODUCT_NAME = "lldb-gtest";
                        };
@@ -9106,8 +9078,6 @@
                                        "-framework",
                                        ApplicationServices,
                                        "$(LLDB_GTESTS_LDFLAGS)",
-                                       "$(LLDB_ZLIB_LDFLAGS)",
-                                       "$(LLDB_COMPRESSION_LDFLAGS)",
                                );
                                PRODUCT_NAME = "lldb-gtest";
                        };
@@ -9150,8 +9120,6 @@
                                        "-framework",
                                        ApplicationServices,
                                        "$(LLDB_GTESTS_LDFLAGS)",
-                                       "$(LLDB_ZLIB_LDFLAGS)",
-                                       "$(LLDB_COMPRESSION_LDFLAGS)",
                                );
                                PRODUCT_NAME = "lldb-gtest";
                        };
@@ -9194,8 +9162,6 @@
                                        "-framework",
                                        ApplicationServices,
                                        "$(LLDB_GTESTS_LDFLAGS)",
-                                       "$(LLDB_ZLIB_LDFLAGS)",
-                                       "$(LLDB_COMPRESSION_LDFLAGS)",
                                );
                                PRODUCT_NAME = "lldb-gtest";
                        };
@@ -9897,22 +9863,9 @@
                                        "-DNDEBUG",
                                );
                                OTHER_LDFLAGS = (
-                                       "$(inherited)",
-                                       "-filelist",
-                                       "$(LLVM_BUILD_DIR)/archives.txt",
-                                       "-framework",
-                                       Foundation,
-                                       "-framework",
-                                       DebugSymbols,
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       CoreServices,
-                                       "-framework",
-                                       ApplicationServices,
-                                       "$(LLDB_GTESTS_LDFLAGS)",
-                                       "$(LLDB_ZLIB_LDFLAGS)",
                                        "$(LLDB_COMPRESSION_LDFLAGS)",
+                                       "$(LLDB_ZLIB_LDFLAGS)",
+                                       "$(LLDB_COVERAGE_LDFLAGS)",
                                );
                                PYTHON_FRAMEWORK_PATH = 
/System/Library/Frameworks/Python.framework/;
                                PYTHON_VERSION_MAJOR = 2;
@@ -10626,22 +10579,9 @@
                                        "-Wimplicit-fallthrough",
                                );
                                OTHER_LDFLAGS = (
-                                       "$(inherited)",
-                                       "-filelist",
-                                       "$(LLVM_BUILD_DIR)/archives.txt",
-                                       "-framework",
-                                       Foundation,
-                                       "-framework",
-                                       DebugSymbols,
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       CoreServices,
-                                       "-framework",
-                                       ApplicationServices,
-                                       "$(LLDB_GTESTS_LDFLAGS)",
-                                       "$(LLDB_ZLIB_LDFLAGS)",
                                        "$(LLDB_COMPRESSION_LDFLAGS)",
+                                       "$(LLDB_ZLIB_LDFLAGS)",
+                                       "$(LLDB_COVERAGE_LDFLAGS)",
                                );
                                PYTHON_FRAMEWORK_PATH = 
/System/Library/Frameworks/Python.framework/;
                                PYTHON_VERSION_MAJOR = 2;


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to