From 5d91d22cf89cb1987f6245eeec4cebc4a0a3da3f Mon Sep 17 00:00:00 2001 From: Rintaro Ishizaki Date: Wed, 11 Feb 2026 14:24:00 -0800 Subject: [PATCH] [ToolchainRegistry] Prefer .dylib SourceKit plugins over .framework rdar://170177167 (cherry picked from commit f6c50f5e04090ff5d56b5dcb0b3d6257af25b8c1) --- Sources/ToolchainRegistry/Toolchain.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/ToolchainRegistry/Toolchain.swift b/Sources/ToolchainRegistry/Toolchain.swift index a6402189..f726ebfe 100644 --- a/Sources/ToolchainRegistry/Toolchain.swift +++ b/Sources/ToolchainRegistry/Toolchain.swift @@ -361,14 +361,14 @@ public final class Toolchain: Sendable { } func findDylib(named name: String, searchFramework: Bool = false) -> URL? { - let frameworkPath = libPath.appending(components: "\(name).framework", name) - if FileManager.default.isFile(at: frameworkPath) { - return frameworkPath - } let libSearchPath = libPath.appending(component: "lib\(name)\(dylibExtension)") if FileManager.default.isFile(at: libSearchPath) { return libSearchPath } + let frameworkPath = libPath.appending(components: "\(name).framework", name) + if FileManager.default.isFile(at: frameworkPath) { + return frameworkPath + } #if os(Windows) let binSearchPath = binPath.appending(component: "\(name)\(dylibExtension)") if FileManager.default.isFile(at: binSearchPath) {