Skip to content

Fix build on Windows #200

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.

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 3 commits into from
Aug 14, 2020
Merged

Fix build on Windows #200

merged 3 commits into from
Aug 14, 2020

Conversation

egorzhdan
Copy link
Contributor

@egorzhdan egorzhdan commented Aug 9, 2020

  • SQLite3 was recently added as a dependency, and the CMake build scripts needed an update
  • SwiftDriver target imports TSCUtility (which has a dependency on TSCBasic) but only linked against TSCBasic
  • SwiftPM uses SwiftDriver.dll & SwiftOptions.dll, so they should be installed into the toolchain bin directory
  • signals are not used on Windows, and strsignal is not available

@egorzhdan
Copy link
Contributor Author

Updated this PR, now it depends on the changes in swiftlang/swift-tools-support-core#106.
cc @compnerd

Copy link
Contributor

@artemcm artemcm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks good.

@@ -93,7 +93,7 @@ public struct OutputFileMap: Equatable {
) throws {
let encoder = JSONEncoder()

#if os(Linux) || os(Android)
#if !canImport(ObjectiveC)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does withoutEscapingSlashes require ObjectiveC?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When this was written, withoutEscapingSlashes wasn't implemented in corelibs-foundation yet. It looks like it's since been added in swiftlang/swift-corelibs-foundation@c3fd6ec, so I think this conditional block can be removed entirely.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @owenv, turns out I was building with an outdated Foundation.
I'll drop that commit to keep the PR focused on Windows-related things.

@compnerd
Copy link
Member

@swift-ci please test

@compnerd
Copy link
Member

@egorzhdan would you mind removing the SQLite3 dependency? That's not a true dependency for this project AFAICT, and its better to fix that in t-s-c rather than add that dependency here. (Or did I miss the import of SQLite in this project?)

SwiftPM depends on SwiftDriver and SwiftOptions DLLs, so they should be installed into the toolchain bin directory
@egorzhdan
Copy link
Contributor Author

@compnerd ok, removed it.

@compnerd
Copy link
Member

CC: @DougGregor

@tomerd
Copy link
Contributor

tomerd commented Aug 13, 2020

lgtm, @DougGregor to approve

@DougGregor
Copy link
Member

LGTM, thank you!

@beccadax beccadax merged commit 599b5b6 into swiftlang:master Aug 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants