Skip to content

Fix Windows Build #24

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 1 commit into from
May 3, 2019
Merged

Fix Windows Build #24

merged 1 commit into from
May 3, 2019

Conversation

gmittert
Copy link
Contributor

@gmittert gmittert commented May 2, 2019

  • Set up config and llvm-config.h to not be unix specific
  • Import WindowsSupport.h and VerisonTuple.h

Files are copied from swift-llvm c7f5aeb11671f3913b774004484f3f340cbef161, same as the other import.

@gmittert
Copy link
Contributor Author

gmittert commented May 2, 2019

@swift-ci please test


/* Define to 1 if you have the <fcntl.h> header file. */
#if __has_include(<fnctl.h>)
Copy link
Contributor

Choose a reason for hiding this comment

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

The "n" and "c" are swapped here, that's what broke the build.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, fixed.

- Set up config and llvm-config.h to not be unix specific
- Import WindowsSupport.h and VerisonTuple.h
@gmittert
Copy link
Contributor Author

gmittert commented May 3, 2019

@swift-ci please test

1 similar comment
@gmittert
Copy link
Contributor Author

gmittert commented May 3, 2019

@swift-ci please test

Copy link
Contributor

@benlangmuir benlangmuir left a comment

Choose a reason for hiding this comment

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

LGTM; the changes to the host/target triple are the only part that might affect existing behaviour: specifically they can affect command-line argument parsing, but we aren't using that right now. We can always bring back something better if we need them.

@benlangmuir benlangmuir merged commit 5cd214b into swiftlang:master May 3, 2019
@gmittert gmittert deleted the WindowsBuild branch August 13, 2019 20:42
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.

2 participants