Merge pull request #915 from Quick/xcode-13-archiving-workaround

Work around Xcode 13 archiving issue
Quick · Jun 10, 2021 · 92dd63d · 92dd63d
2 parents 0406097 + ae8b084
commit 92dd63d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...ckouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift b/...ckouts/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/...heckouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift b/...heckouts/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