Skip to content

[5.9] Enable macros on Windows #68692

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

Closed
wants to merge 14 commits into from

Conversation

bnbarham
Copy link
Contributor

Use WiX to extract a future toolchain to allow building the macros support when building the toolchain. We build swift-syntax and now wire that into the build itself.

@bnbarham bnbarham requested a review from a team as a code owner September 22, 2023 04:04
@bnbarham
Copy link
Contributor Author

swiftlang/swift-installer-scripts#246

@swift-ci please build toolchain windows platform

@bnbarham
Copy link
Contributor Author

swiftlang/llvm-project#7513
swiftlang/swift-installer-scripts#246

@swift-ci please build toolchain windows platform

@bnbarham
Copy link
Contributor Author

@tristanlabelle any idea what's going on with the test failures here? It seems to be the SOURCE_DIR substitution that's failing, but I would have thought the cherry-picks would fix that.

@tristanlabelle
Copy link
Contributor

The tests failures seem to be what I was fixing in #68124 . Unfortunately the conclusion from that PR was that the approach was not the right one. I'm working on implementing a better fix now (wrapping the virtual filesystem on Windows to enforce drive preservation). I can code it in the Swift repo to unblock things faster, but ideally it would go into LLVM.

@bnbarham
Copy link
Contributor Author

The tests failures seem to be what I was fixing in #68124

I assume that implies that the substitution isn't happening on main, in which case I don't think we should be doing it on 5.9. And indeed that does seem to be the case - https://github.com/apple/swift/blob/main/utils/build-windows-toolchain.bat#L16.

IIUC @compnerd included it thinking it may fix some foundation test failures, but it doesn't look like we're ready to include in 5.9. So maybe the best path forward is removing the substitution and then working out the foundation failures?

@tristanlabelle
Copy link
Contributor

I'm also uneasy with having the drive substitution only in 5.9 if it's causing test regressions. I would rather have time to fix those on main. Let's see what comes out of #68743 but if I recall, the problem there was that we had one path that reached MAX_PATH by one or two characters :/

@bnbarham
Copy link
Contributor Author

the problem there was that we had one path that reached MAX_PATH by one or two characters :/

😭

If that's a test path, maybe we can just update the name. Shall see soon!

@bnbarham bnbarham closed this Sep 27, 2023
@bnbarham bnbarham deleted the compnerd-59-windows branch September 27, 2023 06:28
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.

4 participants