Work around Xcode 13 archiving issue

ikesyo · ikesyo · commit ae8b0845230d · 2021-06-10T09:28:35.000+09:00
diff --git a/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift b/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift
@@ -108,7 +108,7 @@ private func machMessageHandler(_ arg: UnsafeMutableRawPointer) -> UnsafeMutable
 		reply.Head.msgh_local_port = UInt32(MACH_PORT_NULL)
 		reply.Head.msgh_remote_port = request.Head.msgh_remote_port
 		reply.Head.msgh_size = UInt32(MemoryLayout<reply_mach_exception_raise_state_t>.size)
-		reply.NDR = NDR_record
+		reply.NDR = _NIMBLE_NDR_RECORD
 		
 		if !handledfirstException {
 			// Use the MiG generated server to invoke our handler for the request and fill in the rest of the reply structure
diff --git a/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift b/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift
@@ -51,5 +51,9 @@ public struct execTypesCountTuple<T: ExpressibleByIntegerLiteral> {
 	public init() {
 	}
 }
+
+// A workaround for a duplicate symbol error when archiving on Xcode 13.
+// See: https://github.com/Quick/Nimble/issues/913
+public let _NIMBLE_NDR_RECORD = NDR_record
 	
 #endif

Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,9 @@ public struct execTypesCountTuple<T: ExpressibleByIntegerLiteral> {`
`51`	`51`	`public init() {`
`52`	`52`	`}`
`53`	`53`	`}`
	`54`	`+`
	`55`	`+// A workaround for a duplicate symbol error when archiving on Xcode 13.`
	`56`	`+// See: https://github.com/Quick/Nimble/issues/913`
	`57`	`+public let _NIMBLE_NDR_RECORD = NDR_record`
`54`	`58`
`55`	`59`	`#endif`