Skip to content

Commit c28a891

Browse files
authored
Minor improvement in SwiftBuildSupport helpers (#8631)
### Motivation: Just a minor cleanup in `SwiftBuildSupport/SwiftBuildSystem.swift` file. ### Modifications: Move the `extension PIFBuilderParameters` helper to `PIFBuilder.swift` instead.
1 parent e5c210a commit c28a891

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

Sources/SwiftBuildSupport/PIFBuilder.swift

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,3 +458,20 @@ extension PIFGenerationError: CustomStringConvertible {
458458
}
459459
}
460460
}
461+
462+
// MARK: - Helpers
463+
464+
extension PIFBuilderParameters {
465+
init(_ buildParameters: BuildParameters, supportedSwiftVersions: [SwiftLanguageVersion]) {
466+
self.init(
467+
triple: buildParameters.triple,
468+
isPackageAccessModifierSupported: buildParameters.driverParameters.isPackageAccessModifierSupported,
469+
enableTestability: buildParameters.enableTestability,
470+
shouldCreateDylibForDynamicProducts: buildParameters.shouldCreateDylibForDynamicProducts,
471+
toolchainLibDir: (try? buildParameters.toolchain.toolchainLibDir) ?? .root,
472+
pkgConfigDirectories: buildParameters.pkgConfigDirectories,
473+
sdkRootPath: buildParameters.toolchain.sdkRootPath,
474+
supportedSwiftVersions: supportedSwiftVersions
475+
)
476+
}
477+
}

Sources/SwiftBuildSupport/SwiftBuildSystem.swift

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -539,21 +539,6 @@ extension String {
539539
}
540540
}
541541

542-
extension PIFBuilderParameters {
543-
public init(_ buildParameters: BuildParameters, supportedSwiftVersions: [SwiftLanguageVersion]) {
544-
self.init(
545-
triple: buildParameters.triple,
546-
isPackageAccessModifierSupported: buildParameters.driverParameters.isPackageAccessModifierSupported,
547-
enableTestability: buildParameters.enableTestability,
548-
shouldCreateDylibForDynamicProducts: buildParameters.shouldCreateDylibForDynamicProducts,
549-
toolchainLibDir: (try? buildParameters.toolchain.toolchainLibDir) ?? .root,
550-
pkgConfigDirectories: buildParameters.pkgConfigDirectories,
551-
sdkRootPath: buildParameters.toolchain.sdkRootPath,
552-
supportedSwiftVersions: supportedSwiftVersions
553-
)
554-
}
555-
}
556-
557542
extension Basics.Diagnostic.Severity {
558543
var isVerbose: Bool {
559544
self <= .info

0 commit comments

Comments
 (0)