Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Plat-10822] Fix for duplicate C++ library warnings #1581

Open
wants to merge 3 commits into
base: next
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 2 additions & 44 deletions Bugsnag.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1087,8 +1087,6 @@
CBBDE9BF280069B20070DCD3 /* BSG_KSString.c in Sources */ = {isa = PBXBuildFile; fileRef = 008969242486DAD000DC48C2 /* BSG_KSString.c */; };
CBBDE9C0280069B20070DCD3 /* BSG_KSMach_x86_32.c in Sources */ = {isa = PBXBuildFile; fileRef = 008969032486DAD000DC48C2 /* BSG_KSMach_x86_32.c */; };
CBBDE9C2280069B20070DCD3 /* BSG_KSMach_Arm64.c in Sources */ = {isa = PBXBuildFile; fileRef = 008969172486DAD000DC48C2 /* BSG_KSMach_Arm64.c */; };
CBBDE9C4280069D10070DCD3 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CBBDE9C3280069D10070DCD3 /* libc++.tbd */; };
CBBDE9C6280069D90070DCD3 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CBBDE9C5280069D90070DCD3 /* libz.tbd */; };
CBCAF6FA25A457F90095771F /* BSGFileLocations.h in Headers */ = {isa = PBXBuildFile; fileRef = CBCAF6F825A457F90095771F /* BSGFileLocations.h */; };
CBCAF6FB25A457F90095771F /* BSGFileLocations.h in Headers */ = {isa = PBXBuildFile; fileRef = CBCAF6F825A457F90095771F /* BSGFileLocations.h */; };
CBCAF6FC25A457F90095771F /* BSGFileLocations.h in Headers */ = {isa = PBXBuildFile; fileRef = CBCAF6F825A457F90095771F /* BSGFileLocations.h */; };
Expand Down Expand Up @@ -1178,16 +1176,10 @@
E746291C248907E500F92D67 /* BSG_KSCrashC.c in Sources */ = {isa = PBXBuildFile; fileRef = 0089694B2486DAD000DC48C2 /* BSG_KSCrashC.c */; };
E746292524890BFE00F92D67 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E746292424890BFE00F92D67 /* Foundation.framework */; };
E746292724890C1100F92D67 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E746292624890C1100F92D67 /* SystemConfiguration.framework */; };
E746292924890C1500F92D67 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E746292824890C1500F92D67 /* libc++.tbd */; };
E746292B24890C1A00F92D67 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E746292A24890C1A00F92D67 /* libz.tbd */; };
E746292D24890C3300F92D67 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E746292C24890C3300F92D67 /* Foundation.framework */; };
E746292F24890C3900F92D67 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E746292E24890C3900F92D67 /* SystemConfiguration.framework */; };
E746293224890C5200F92D67 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E746293124890C4300F92D67 /* libz.tbd */; };
E746293324890C5700F92D67 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E746293024890C3D00F92D67 /* libc++.tbd */; };
E746293524890C6500F92D67 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E746293424890C6500F92D67 /* Foundation.framework */; };
E746293724890C6B00F92D67 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E746293624890C6B00F92D67 /* SystemConfiguration.framework */; };
E746293924890C7400F92D67 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E746293824890C7000F92D67 /* libc++.tbd */; };
E746293B24890C7E00F92D67 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E746293A24890C7900F92D67 /* libz.tbd */; };
E746293C24890C9F00F92D67 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E746292424890BFE00F92D67 /* Foundation.framework */; };
E746293D24890CA400F92D67 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E746292624890C1100F92D67 /* SystemConfiguration.framework */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -1590,8 +1582,6 @@
CBB0928B2519F891007698BC /* BugsnagSystemState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BugsnagSystemState.h; sourceTree = "<group>"; };
CBBDE8F8280067AB0070DCD3 /* Bugsnag.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Bugsnag.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CBBDE901280067AB0070DCD3 /* Bugsnag-watchOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Bugsnag-watchOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
CBBDE9C3280069D10070DCD3 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "Platforms/WatchOS.platform/Developer/SDKs/WatchOS8.3.sdk/usr/lib/libc++.tbd"; sourceTree = DEVELOPER_DIR; };
CBBDE9C5280069D90070DCD3 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS8.3.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
CBBDE9C7280069E40070DCD3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
CBCAF6F825A457F90095771F /* BSGFileLocations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BSGFileLocations.h; sourceTree = "<group>"; };
CBCAF6F925A457F90095771F /* BSGFileLocations.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BSGFileLocations.m; sourceTree = "<group>"; };
Expand All @@ -1615,25 +1605,17 @@
E701FAAE2490EFE8008D842F /* ConfigurationApiValidationTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ConfigurationApiValidationTest.m; sourceTree = "<group>"; };
E746292424890BFE00F92D67 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
E746292624890C1100F92D67 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
E746292824890C1500F92D67 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
E746292A24890C1A00F92D67 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
E746292C24890C3300F92D67 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
E746292E24890C3900F92D67 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
E746293024890C3D00F92D67 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/lib/libc++.tbd"; sourceTree = DEVELOPER_DIR; };
E746293124890C4300F92D67 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
E746293424890C6500F92D67 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS13.4.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
E746293624890C6B00F92D67 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS13.4.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
E746293824890C7000F92D67 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS13.4.sdk/usr/lib/libc++.tbd"; sourceTree = DEVELOPER_DIR; };
E746293A24890C7900F92D67 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS13.4.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
00AD1C6F24869B0E00A27979 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E746292B24890C1A00F92D67 /* libz.tbd in Frameworks */,
E746292924890C1500F92D67 /* libc++.tbd in Frameworks */,
E746292724890C1100F92D67 /* SystemConfiguration.framework in Frameworks */,
E746292524890BFE00F92D67 /* Foundation.framework in Frameworks */,
CBEC89382A4AC8520088A3CE /* UIKit.framework in Frameworks */,
Expand All @@ -1653,8 +1635,6 @@
buildActionMask = 2147483647;
files = (
E746292F24890C3900F92D67 /* SystemConfiguration.framework in Frameworks */,
E746293224890C5200F92D67 /* libz.tbd in Frameworks */,
E746293324890C5700F92D67 /* libc++.tbd in Frameworks */,
E746292D24890C3300F92D67 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -1671,8 +1651,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E746293924890C7400F92D67 /* libc++.tbd in Frameworks */,
E746293B24890C7E00F92D67 /* libz.tbd in Frameworks */,
E746293724890C6B00F92D67 /* SystemConfiguration.framework in Frameworks */,
E746293524890C6500F92D67 /* Foundation.framework in Frameworks */,
);
Expand Down Expand Up @@ -1707,8 +1685,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CBBDE9C6280069D90070DCD3 /* libz.tbd in Frameworks */,
CBBDE9C4280069D10070DCD3 /* libc++.tbd in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -2250,19 +2226,11 @@
children = (
CBEC89372A4AC8520088A3CE /* UIKit.framework */,
CBBDE9C7280069E40070DCD3 /* Foundation.framework */,
CBBDE9C5280069D90070DCD3 /* libz.tbd */,
CBBDE9C3280069D10070DCD3 /* libc++.tbd */,
01A617842733D15C00024A0B /* BugsnagNetworkRequestPlugin.framework */,
E746293A24890C7900F92D67 /* libz.tbd */,
E746293824890C7000F92D67 /* libc++.tbd */,
E746293624890C6B00F92D67 /* SystemConfiguration.framework */,
E746293424890C6500F92D67 /* Foundation.framework */,
E746293124890C4300F92D67 /* libz.tbd */,
E746293024890C3D00F92D67 /* libc++.tbd */,
E746292E24890C3900F92D67 /* SystemConfiguration.framework */,
E746292C24890C3300F92D67 /* Foundation.framework */,
E746292A24890C1A00F92D67 /* libz.tbd */,
E746292824890C1500F92D67 /* libc++.tbd */,
E746292624890C1100F92D67 /* SystemConfiguration.framework */,
E746292424890BFE00F92D67 /* Foundation.framework */,
);
Expand Down Expand Up @@ -3891,7 +3859,6 @@
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
Expand All @@ -3916,11 +3883,7 @@
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-lc++",
"-lz",
"-ObjC",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.Bugsnag;
PRODUCT_NAME = Bugsnag;
RUN_CLANG_STATIC_ANALYZER = YES;
Expand All @@ -3940,7 +3903,6 @@
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
Expand All @@ -3958,11 +3920,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = (
"-lc++",
"-lz",
"-ObjC",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.Bugsnag;
PRODUCT_NAME = Bugsnag;
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,6 @@
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
Expand Down Expand Up @@ -1158,7 +1157,6 @@
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
Expand Down
2 changes: 0 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ let package = Package(
.headerSearchPath("Storage"),
],
linkerSettings: [
.linkedLibrary("z"),
.linkedLibrary("c++"),
]
),
.target(
Expand Down
Loading
Loading