Skip to content

Revert JSON format change and fix bug introduced by #3696 #3793

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
Oct 6, 2021
Merged

Revert JSON format change and fix bug introduced by #3696 #3793

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
11 changes: 10 additions & 1 deletion Sources/Workspace/Destination.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ extension Destination {
binDir: destination.binDir,
extraCCFlags: destination.extraCCFlags,
extraSwiftCFlags: destination.extraSwiftCFlags,
extraCPPFlags: destination.extraCCFlags
extraCPPFlags: destination.extraCPPFlags
)
}
}
Expand All @@ -241,4 +241,13 @@ fileprivate struct DestinationInfo: Codable {
let extraCCFlags: [String]
let extraSwiftCFlags: [String]
let extraCPPFlags: [String]

enum CodingKeys: String, CodingKey {
case target
case sdk
case binDir = "toolchain-bin-dir"
case extraCCFlags = "extra-cc-flags"
case extraSwiftCFlags = "extra-swiftc-flags"
case extraCPPFlags = "extra-cpp-flags"
}
}