Skip to content

Do not generate a build parameters file if a custom one has been passed #3693

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 31, 2021
Merged

Do not generate a build parameters file if a custom one has been passed #3693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions Sources/XCBuildSupport/XcodeBuildSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,15 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem {
subset.pifTargetName
]

let buildParamsFile = try createBuildParametersFile()
if let buildParamsFile = buildParamsFile {
arguments += ["--buildParametersFile", buildParamsFile.pathString]
let buildParamsFile: AbsolutePath?
// Do not generate a build parameters file if a custom one has been passed.
if !buildParameters.xcbuildFlags.contains("--buildParametersFile") {
buildParamsFile = try createBuildParametersFile()
if let buildParamsFile = buildParamsFile {
arguments += ["--buildParametersFile", buildParamsFile.pathString]
}
} else {
buildParamsFile = nil
}

arguments += buildParameters.xcbuildFlags
Expand Down Expand Up @@ -134,7 +140,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem {
}
}

func createBuildParametersFile() throws -> AbsolutePath? {
func createBuildParametersFile() throws -> AbsolutePath {
// Generate the run destination parameters.
let runDestination = XCBBuildParameters.RunDestination(
platform: "macosx",
Expand Down