Author: gclayton
Date: Tue Dec 3 13:41:45 2013
New Revision: 196309
URL: http://llvm.org/viewvc/llvm-project?rev=196309&view=rev
Log:
Fixed up the framework includes to all be done in the extra linker options. We
had a mix where some were being included via Xcode GUI and some were done in
the extra linker flags.
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=196309&r1=196308&r2=196309&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Dec 3 13:41:45 2013
@@ -51,6 +51,8 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
+ 2606EDDE184E68940034641B /* Foundation.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = 260C876910F538E700BB2B04 /*
Foundation.framework */; };
+ 2606EDDF184E68A10034641B /* liblldb-core.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 2689FFCA13353D7A00698AC0 /* liblldb-core.a */; };
260A248E15D06C50009981B0 /* OptionValues.h in Headers */ = {isa
= PBXBuildFile; fileRef = 260A248D15D06C4F009981B0 /* OptionValues.h */; };
260CC62E15D04377002BF2E0 /* OptionValueArgs.h in Headers */ =
{isa = PBXBuildFile; fileRef = 260CC62115D04377002BF2E0 /* OptionValueArgs.h
*/; };
260CC62F15D04377002BF2E0 /* OptionValueArray.h in Headers */ =
{isa = PBXBuildFile; fileRef = 260CC62215D04377002BF2E0 /* OptionValueArray.h
*/; };
@@ -108,7 +110,6 @@
265205A813D3E3F700132FE2 /* RegisterContextKDP_arm.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 265205A213D3E3F700132FE2 /*
RegisterContextKDP_arm.cpp */; };
265205AA13D3E3F700132FE2 /* RegisterContextKDP_i386.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 265205A413D3E3F700132FE2 /*
RegisterContextKDP_i386.cpp */; };
265205AC13D3E3F700132FE2 /* RegisterContextKDP_x86_64.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 265205A613D3E3F700132FE2 /*
RegisterContextKDP_x86_64.cpp */; };
- 2654283F184D025800F27E00 /* Carbon.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 4C74CB6212288704006A8171 /* Carbon.framework */;
};
2660AAB914622483003A9694 /* LLDBWrapPython.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp
*/; };
2663E379152BD1890091EC22 /* ReadWriteLock.h in Headers */ =
{isa = PBXBuildFile; fileRef = 2663E378152BD1890091EC22 /* ReadWriteLock.h */;
};
26651A18133BF9E0005B64B7 /* Opcode.cpp in Sources */ = {isa =
PBXBuildFile; fileRef = 26651A17133BF9DF005B64B7 /* Opcode.cpp */; };
@@ -436,8 +437,6 @@
26ACEC2815E077AE00E94760 /* Property.h in Headers */ = {isa =
PBXBuildFile; fileRef = 26ACEC2715E077AE00E94760 /* Property.h */; };
26B1EFAE154638AF00E2DAC7 /* DWARFDeclContext.cpp in Sources */
= {isa = PBXBuildFile; fileRef = 26B1EFAC154638AF00E2DAC7 /*
DWARFDeclContext.cpp */; };
26B1EFAF154638AF00E2DAC7 /* DWARFDeclContext.h in Headers */ =
{isa = PBXBuildFile; fileRef = 26B1EFAD154638AF00E2DAC7 /* DWARFDeclContext.h
*/; };
- 26B1FCB813381071002886E2 /* CoreFoundation.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C39010F3FA26009D5894 /*
CoreFoundation.framework */; };
- 26B1FCBC13381071002886E2 /* libobjc.dylib in Frameworks */ =
{isa = PBXBuildFile; fileRef = 26F5C37410F3F61B009D5894 /* libobjc.dylib */; };
26B1FCC21338115F002886E2 /* Host.mm in Sources */ = {isa =
PBXBuildFile; fileRef = 26BC7EE810F1B88F00F91463 /* Host.mm */; };
26B42C4D1187ABA50079C8C8 /* LLDB.h in Headers */ = {isa =
PBXBuildFile; fileRef = 26B42C4C1187ABA50079C8C8 /* LLDB.h */; settings =
{ATTRIBUTES = (Public, ); }; };
26B7564E14F89356008D9CB3 /* PlatformiOSSimulator.cpp in Sources
*/ = {isa = PBXBuildFile; fileRef = 26B7564C14F89356008D9CB3 /*
PlatformiOSSimulator.cpp */; };
@@ -461,16 +460,12 @@
26D5E163135BB054006EA0A7 /* OptionGroupPlatform.cpp in Sources
*/ = {isa = PBXBuildFile; fileRef = 26D5E162135BB054006EA0A7 /*
OptionGroupPlatform.cpp */; };
26D6F3F6183E7F9300194858 /* lldb-gdbserver.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 26D6F3F4183E7F9300194858 /* lldb-gdbserver.cpp
*/; };
26D6F3FA183E888800194858 /* liblldb-core.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 2689FFCA13353D7A00698AC0 /* liblldb-core.a */; };
- 26D6F3FB183E88D500194858 /* libxml2.dylib in Frameworks */ =
{isa = PBXBuildFile; fileRef = 26D55234159A7DB100708D8D /* libxml2.dylib */; };
- 26D6F3FC183E88DD00194858 /* CoreFoundation.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C39010F3FA26009D5894 /*
CoreFoundation.framework */; };
- 26D6F3FD183E88F000194858 /* Security.framework in Frameworks */
= {isa = PBXBuildFile; fileRef = EDB919B414F6F10D008FF64B /* Security.framework
*/; };
26D7E45D13D5E30A007FD12B /* SocketAddress.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 26D7E45C13D5E30A007FD12B /* SocketAddress.cpp
*/; };
26DAED6015D327A200E15819 /* OptionValuePathMappings.h in
Headers */ = {isa = PBXBuildFile; fileRef = 26DAED5F15D327A200E15819 /*
OptionValuePathMappings.h */; };
26DAED6315D327C200E15819 /* OptionValuePathMappings.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 26DAED6215D327C200E15819 /*
OptionValuePathMappings.cpp */; };
26DB3E161379E7AD0080DC73 /* ABIMacOSX_arm.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 26DB3E071379E7AD0080DC73 /* ABIMacOSX_arm.cpp
*/; };
26DB3E1C1379E7AD0080DC73 /* ABIMacOSX_i386.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 26DB3E0F1379E7AD0080DC73 /* ABIMacOSX_i386.cpp
*/; };
26DB3E1F1379E7AD0080DC73 /* ABISysV_x86_64.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 26DB3E131379E7AD0080DC73 /* ABISysV_x86_64.cpp
*/; };
- 26DC6A171337FE8000FF7998 /* liblldb-core.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 2689FFCA13353D7A00698AC0 /* liblldb-core.a */; };
26DC6A1D1337FECA00FF7998 /* lldb-platform.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 26DC6A1C1337FECA00FF7998 /* lldb-platform.cpp
*/; };
26DE1E6C11616C2E00A093E2 /* lldb-forward.h in Headers */ = {isa
= PBXBuildFile; fileRef = 26DE1E6A11616C2E00A093E2 /* lldb-forward.h */;
settings = {ATTRIBUTES = (Public, ); }; };
26DE204111618AB900A093E2 /* SBSymbolContext.h in Headers */ =
{isa = PBXBuildFile; fileRef = 26DE204011618AB900A093E2 /* SBSymbolContext.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
@@ -519,7 +514,6 @@
4C3ADCD61810D88B00357218 /* BreakpointResolverFileRegex.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 4CAA56141422D986001FFA01 /*
BreakpointResolverFileRegex.cpp */; };
4C6649A014EEE7F100B0316F /* StreamCallback.h in Headers */ =
{isa = PBXBuildFile; fileRef = 4C66499F14EEE7F100B0316F /* StreamCallback.h */;
};
4C6649A314EEE81000B0316F /* StreamCallback.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 4C6649A214EEE81000B0316F /* StreamCallback.cpp
*/; };
- 4C701C1E15ABB70C00B50001 /* libxml2.dylib in Frameworks */ =
{isa = PBXBuildFile; fileRef = 26D55234159A7DB100708D8D /* libxml2.dylib */; };
4CABA9E0134A8BCD00539BDD /* ValueObjectMemory.cpp in Sources */
= {isa = PBXBuildFile; fileRef = 4CABA9DF134A8BCD00539BDD /*
ValueObjectMemory.cpp */; };
4CCA644D13B40B82003BDF98 /* ItaniumABILanguageRuntime.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 4CCA643D13B40B82003BDF98 /*
ItaniumABILanguageRuntime.cpp */; };
4CCA645013B40B82003BDF98 /* AppleObjCRuntime.cpp in Sources */
= {isa = PBXBuildFile; fileRef = 4CCA644213B40B82003BDF98 /*
AppleObjCRuntime.cpp */; };
@@ -637,7 +631,6 @@
ED88245015114CA200BC98B9 /* main.mm in Sources */ = {isa =
PBXBuildFile; fileRef = ED88244F15114CA200BC98B9 /* main.mm */; };
ED88245115114CA200BC98B9 /* main.mm in Sources */ = {isa =
PBXBuildFile; fileRef = ED88244F15114CA200BC98B9 /* main.mm */; };
ED88245315114CFC00BC98B9 /* LauncherRootXPCService.mm in
Sources */ = {isa = PBXBuildFile; fileRef = ED88245215114CFC00BC98B9 /*
LauncherRootXPCService.mm */; };
- EDB919B714F6F22D008FF64B /* Security.framework in Frameworks */
= {isa = PBXBuildFile; fileRef = EDB919B414F6F10D008FF64B /* Security.framework
*/; };
EDC6D4AA14E5C49E001B75F8 /* LauncherXPCService.mm in Sources */
= {isa = PBXBuildFile; fileRef = EDC6D49414E5C15C001B75F8 /*
LauncherXPCService.mm */; };
/* End PBXBuildFile section */
@@ -1865,10 +1858,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 26D6F3FD183E88F000194858 /* Security.framework
in Frameworks */,
- 26D6F3FC183E88DD00194858 /*
CoreFoundation.framework in Frameworks */,
- 26D6F3FB183E88D500194858 /* libxml2.dylib in
Frameworks */,
26D6F3FA183E888800194858 /* liblldb-core.a in
Frameworks */,
+ 2606EDDE184E68940034641B /*
Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1876,12 +1867,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 2654283F184D025800F27E00 /* Carbon.framework in
Frameworks */,
- 4C701C1E15ABB70C00B50001 /* libxml2.dylib in
Frameworks */,
- 26DC6A171337FE8000FF7998 /* liblldb-core.a in
Frameworks */,
- 26B1FCB813381071002886E2 /*
CoreFoundation.framework in Frameworks */,
- 26B1FCBC13381071002886E2 /* libobjc.dylib in
Frameworks */,
- EDB919B714F6F22D008FF64B /* Security.framework
in Frameworks */,
+ 2606EDDF184E68A10034641B /* liblldb-core.a in
Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4840,24 +4826,20 @@
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = (
- "-framework",
- Carbon,
- "-framework",
- DebugSymbols,
"-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
"-lpython2.7",
"-lllvmclang",
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Carbon,
+ "-framework",
+ DebugSymbols,
+ "-framework",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
- "-v",
- "-t",
"-framework",
Foundation,
);
@@ -4905,24 +4887,20 @@
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = (
- "-framework",
- Carbon,
- "-framework",
- DebugSymbols,
"-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
"-lpython2.7",
"-lllvmclang",
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Carbon,
+ "-framework",
+ DebugSymbols,
+ "-framework",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
- "-v",
- "-t",
"-framework",
Foundation,
);
@@ -5242,25 +5220,20 @@
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = (
- "-framework",
- Carbon,
- "-framework",
- DebugSymbols,
"-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
"-lpython2.7",
"-lllvmclang",
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Carbon,
+ "-framework",
+ DebugSymbols,
+ "-framework",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
- "-v",
- "-t",
- "-Wl,-v",
"-framework",
Foundation,
);
@@ -5401,9 +5374,7 @@
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
@@ -5466,6 +5437,7 @@
OTHER_LDFLAGS = (
"-lllvmclang",
"-lpython",
+ "-lxml2",
"-framework",
DebugSymbols,
"-framework",
@@ -5473,9 +5445,7 @@
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
@@ -5543,9 +5513,7 @@
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
@@ -5612,9 +5580,7 @@
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
@@ -5663,6 +5629,7 @@
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
"$(inherited)",
);
+ MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
"-flimit-debug-info",
@@ -5683,9 +5650,9 @@
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Carbon,
+ "-framework",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
@@ -5731,6 +5698,7 @@
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
"$(inherited)",
);
+ MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
"-flimit-debug-info",
@@ -5751,9 +5719,9 @@
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Carbon,
+ "-framework",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
@@ -5799,6 +5767,7 @@
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
"$(inherited)",
);
+ MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
"-flimit-debug-info",
@@ -5819,9 +5788,9 @@
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Carbon,
+ "-framework",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
@@ -6053,24 +6022,20 @@
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = (
- "-framework",
- Carbon,
- "-framework",
- DebugSymbols,
"-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
"-lpython2.7",
"-lllvmclang",
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Carbon,
+ "-framework",
+ DebugSymbols,
+ "-framework",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
- "-v",
- "-t",
"-framework",
Foundation,
);
@@ -6162,6 +6127,7 @@
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
"$(inherited)",
);
+ MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
"-flimit-debug-info",
@@ -6182,9 +6148,9 @@
"-framework",
Foundation,
"-framework",
- AppKit,
- "-v",
- "-Wl,-v",
+ Carbon,
+ "-framework",
+ Security,
);
"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
"-lllvmclang",
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
