Skip to content
This repository was archived by the owner on Apr 2, 2020. It is now read-only.

Commit 1995b66

Browse files
tfialatfiala
committed
fix up lldb-mi linkage on build-script-driven macOS build
lldb-mi somehow lost its dependency on zlib in build-script-driven builds on macOS.
1 parent 82b8e9b commit 1995b66

File tree

1 file changed

+8
-57
lines changed

1 file changed

+8
-57
lines changed

‎lldb.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
237211D41D3FD10D008D2754 /* SymbolFilePDB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF6335E01C87B21E00F7D554 /* SymbolFilePDB.cpp */; };
122122
2374D7531D4BB2FF005C9575 /* GDBRemoteClientBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2374D74E1D4BB299005C9575 /* GDBRemoteClientBase.cpp */; };
123123
2377C2F819E613C100737875 /* PipePosix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2377C2F719E613C100737875 /* PipePosix.cpp */; };
124-
237E0CE31D908F4B00DD3F2B /* StringExtractor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2660D9F611922A1300958FBD /* StringExtractor.cpp */; };
125124
237E0CE41D908F5300DD3F2B /* StringExtractor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2660D9F611922A1300958FBD /* StringExtractor.cpp */; };
126125
238F2B9E1D2C82D0001FF92A /* StructuredDataPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 238F2B9D1D2C82D0001FF92A /* StructuredDataPlugin.cpp */; };
127126
238F2BA11D2C835A001FF92A /* StructuredDataPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 238F2B9F1D2C835A001FF92A /* StructuredDataPlugin.h */; };
@@ -956,7 +955,6 @@
956955
94D0858C1B9675B8000D24BD /* FormattersHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94D0858B1B9675B8000D24BD /* FormattersHelpers.cpp */; };
957956
94E829CA152D33C1006F96A3 /* lldb-server in Resources */ = {isa = PBXBuildFile; fileRef = 26DC6A101337FE6900FF7998 /* lldb-server */; };
958957
94FA3DE01405D50400833217 /* ValueObjectConstResultChild.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94FA3DDF1405D50300833217 /* ValueObjectConstResultChild.cpp */; };
959-
94FC9E671D95D74E00976A81 /* lldb.1 in Copy Files */ = {isa = PBXBuildFile; fileRef = AF90106315AB7C5700FF120D /* lldb.1 */; };
960958
964381701C8D6B8200023D59 /* SBLanguageRuntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF20F76C1AF18FC700751A6E /* SBLanguageRuntime.cpp */; };
961959
964463EC1A330C0500154ED8 /* CompactUnwindInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 964463EB1A330C0500154ED8 /* CompactUnwindInfo.cpp */; };
962960
966C6B7918E6A56A0093F5EC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 966C6B7818E6A56A0093F5EC /* libz.dylib */; };
@@ -1353,27 +1351,12 @@
13531351
dstPath = "/$(DT_VARIANT)/$(DEVELOPER_INSTALL_DIR)/usr/share/man/man1";
13541352
dstSubfolderSpec = 0;
13551353
files = (
1356-
49DEF1221CD7BD90006A7C7D /* BlockPointer.h in Copy Files */,
1357-
AF90106515AB7D3600FF120D /* lldb.1 in Copy Files */,
1358-
23D0658E1D4A7BDA0008EDE6 /* RenderScriptx86ABIFixups.h in Copy Files */,
13591354
23CB14FB1D66CCF100EDDDE1 /* CMakeLists.txt in Copy Files */,
13601355
23150FC01DB939F800EA5AB6 /* CMakeLists.txt in Copy Files */,
1361-
2374D7521D4BB299005C9575 /* GDBRemoteClientBase.h in Copy Files */,
1362-
23D0658C1D4A7BDA0008EDE6 /* RenderScriptRuntime.h in Copy Files */,
1363-
23D0658A1D4A7BDA0008EDE6 /* RenderScriptExpressionOpts.h in Copy Files */,
13641356
23CB14F21D66CC9000EDDDE1 /* CMakeLists.txt in Copy Files */,
1365-
230EC4591D63C3A7008DF59F /* CMakeLists.txt in Copy Files */,
1366-
49DEF1221CD7BD90006A7C7D /* BlockPointer.h in Copy Files */,
1367-
2374D7461D4BAA1D005C9575 /* CMakeLists.txt in Copy Files */,
1368-
4CC7C6531D5299140076FF94 /* DWARFASTParserOCaml.h in Copy Files */,
1369-
23DCBE9D1D63E14B0084C36B /* SBTypeEnumMember.i in Copy Files */,
1370-
AF90106515AB7D3600FF120D /* lldb.1 in Copy Files */,
13711357
23A452021DBFF67000E44395 /* CMakeLists.txt in Copy Files */,
13721358
23A4520D1DBFF77400E44395 /* CMakeLists.txt in Copy Files */,
1373-
23DCBE9B1D63E14B0084C36B /* SBLanguageRuntime.i in Copy Files */,
13741359
23CB14F71D66CCD600EDDDE1 /* CMakeLists.txt in Copy Files */,
1375-
23DCBE9E1D63E14B0084C36B /* SBUnixSignals.i in Copy Files */,
1376-
23D065881D4A7BDA0008EDE6 /* CMakeLists.txt in Copy Files */,
13771360
23CB14F41D66CC9B00EDDDE1 /* CMakeLists.txt in Copy Files */,
13781361
);
13791362
name = "Copy Files";
@@ -7479,35 +7462,6 @@
74797462
/* End PBXShellScriptBuildPhase section */
74807463

74817464
/* Begin PBXSourcesBuildPhase section */
7482-
239504D01BDD451400963CEA /* Sources */ = {
7483-
isa = PBXSourcesBuildPhase;
7484-
buildActionMask = 2147483647;
7485-
files = (
7486-
AEC6FFA01BE970A2007882C1 /* GoParserTest.cpp in Sources */,
7487-
237E0CE31D908F4B00DD3F2B /* StringExtractor.cpp in Sources */,
7488-
23CB15001D66CD3900EDDDE1 /* CPlusPlusLanguageTest.cpp in Sources */,
7489-
239504E51BDD454B00963CEA /* UriParserTest.cpp in Sources */,
7490-
23CB14FF1D66CD2900EDDDE1 /* FileSpecTest.cpp in Sources */,
7491-
AF45E1FE1BF57C8D000563EB /* PythonTestSuite.cpp in Sources */,
7492-
3FA093151BF65D3A0037DD08 /* PythonExceptionStateTests.cpp in Sources */,
7493-
23CB14EF1D66CC1F00EDDDE1 /* DataExtractorTest.cpp in Sources */,
7494-
2370A3861D66C594000E7BE6 /* GDBRemoteClientBaseTest.cpp in Sources */,
7495-
239504DF1BDD453200963CEA /* SocketTest.cpp in Sources */,
7496-
239504E11BDD453E00963CEA /* TestArgs.cpp in Sources */,
7497-
2370A3871D66C594000E7BE6 /* GDBRemoteCommunicationClientTest.cpp in Sources */,
7498-
239504E21BDD454500963CEA /* PythonDataObjectsTests.cpp in Sources */,
7499-
239504E01BDD453200963CEA /* SymbolsTest.cpp in Sources */,
7500-
23CB150F1D66CF5D00EDDDE1 /* TestClangASTContext.cpp in Sources */,
7501-
239504E31BDD454B00963CEA /* StringExtractorTest.cpp in Sources */,
7502-
239504E41BDD454B00963CEA /* TaskPoolTest.cpp in Sources */,
7503-
23CB14EE1D66CC1400EDDDE1 /* BroadcasterTest.cpp in Sources */,
7504-
23CB14F01D66CC2300EDDDE1 /* ScalarTest.cpp in Sources */,
7505-
239504DE1BDD453200963CEA /* SocketAddressTest.cpp in Sources */,
7506-
2370A3881D66C594000E7BE6 /* GDBRemoteTestUtils.cpp in Sources */,
7507-
2326CF521BDD693B00A5CEAC /* EditlineTest.cpp in Sources */,
7508-
);
7509-
runOnlyForDeploymentPostprocessing = 0;
7510-
};
75117465
23CB15321D66DA9300EDDDE1 /* Sources */ = {
75127466
isa = PBXSourcesBuildPhase;
75137467
buildActionMask = 2147483647;
@@ -8656,7 +8610,7 @@
86568610
"$(LLDB_COVERAGE_CFLAGS)",
86578611
"-Wimplicit-fallthrough",
86588612
);
8659-
OTHER_LDFLAGS = "-lz";
8613+
OTHER_LDFLAGS = "$(LLDB_ZLIB_LDFLAGS)";
86608614
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework;
86618615
PYTHON_VERSION_MAJOR = 2;
86628616
PYTHON_VERSION_MINOR = 7;
@@ -8788,7 +8742,7 @@
87888742
"$(LLDB_COVERAGE_CFLAGS)",
87898743
"-Wimplicit-fallthrough",
87908744
);
8791-
OTHER_LDFLAGS = "-lz";
8745+
OTHER_LDFLAGS = "$(LLDB_ZLIB_LDFLAGS)";
87928746
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework;
87938747
PYTHON_VERSION_MAJOR = 2;
87948748
PYTHON_VERSION_MINOR = 7;
@@ -8976,7 +8930,7 @@
89768930
"$(LLDB_GTESTS_CFLAGS)",
89778931
"-DGTEST_HAS_RTTI=0",
89788932
);
8979-
OTHER_LDFLAGS = "";
8933+
OTHER_LDFLAGS = "$(LLDB_ZLIB_LDFLAGS)";
89808934
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework;
89818935
PYTHON_VERSION_MAJOR = 2;
89828936
PYTHON_VERSION_MINOR = 7;
@@ -10503,7 +10457,7 @@
1050310457
"-DLLDB_BUILD_DATE=\"$(LLDB_BUILD_DATE)\"",
1050410458
"$(LLDB_VERSION_SCHEME_CFLAGS)",
1050510459
);
10506-
OTHER_LDFLAGS = "-lz";
10460+
OTHER_LDFLAGS = "$(LLDB_ZLIB_LDFLAGS)";
1050710461
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework;
1050810462
PYTHON_VERSION_MAJOR = 2;
1050910463
PYTHON_VERSION_MINOR = 7;
@@ -11515,10 +11469,7 @@
1151511469
"-DLLDB_BUILD_DATE=\"$(LLDB_BUILD_DATE)\"",
1151611470
"$(LLDB_VERSION_SCHEME_CFLAGS)",
1151711471
);
11518-
OTHER_LDFLAGS = (
11519-
"$(LLDB_COMPRESSION_LDFLAGS)",
11520-
"$(LLDB_ZLIB_LDFLAGS)",
11521-
);
11472+
OTHER_LDFLAGS = "$(LLDB_ZLIB_LDFLAGS)";
1152211473
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework;
1152311474
PYTHON_VERSION_MAJOR = 2;
1152411475
PYTHON_VERSION_MINOR = 7;
@@ -12219,7 +12170,7 @@
1221912170
"-DLLDB_BUILD_DATE=\"$(LLDB_BUILD_DATE)\"",
1222012171
"$(LLDB_VERSION_SCHEME_CFLAGS)",
1222112172
);
12222-
OTHER_LDFLAGS = "";
12173+
OTHER_LDFLAGS = "$(LLDB_ZLIB_LDFLAGS)";
1222312174
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework;
1222412175
PYTHON_VERSION_MAJOR = 2;
1222512176
PYTHON_VERSION_MINOR = 7;
@@ -13155,7 +13106,7 @@
1315513106
"-DLLDB_BUILD_DATE=\"$(LLDB_BUILD_DATE)\"",
1315613107
"$(LLDB_VERSION_SCHEME_CFLAGS)",
1315713108
);
13158-
OTHER_LDFLAGS = "";
13109+
OTHER_LDFLAGS = "$(LLDB_ZLIB_LDFLAGS)";
1315913110
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework;
1316013111
PYTHON_VERSION_MAJOR = 2;
1316113112
PYTHON_VERSION_MINOR = 7;
@@ -13750,7 +13701,7 @@
1375013701
"$(LLDB_VERSION_SCHEME_CFLAGS)",
1375113702
"-Wimplicit-fallthrough",
1375213703
);
13753-
OTHER_LDFLAGS = "";
13704+
OTHER_LDFLAGS = "$(LLDB_ZLIB_LDFLAGS)";
1375413705
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework;
1375513706
PYTHON_VERSION_MAJOR = 2;
1375613707
PYTHON_VERSION_MINOR = 7;

0 commit comments

Comments
 (0)