Skip to content

Fix up self-discovery of Swift Driver and tools #1067

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

Jump to bottom
Merged
merged 3 commits into from
Sep 19, 2022
Merged

Fix up self-discovery of Swift Driver and tools #1067

merged 3 commits into from
Sep 19, 2022

Conversation

@stevapple
Copy link
Contributor

@stevapple stevapple commented Apr 20, 2022

The arguments is modified by Driver.invocationRunMode, so the first element is no longer the driver itself.

I’m surprised that no one has discovered this so far👀

@stevapple
Fix looking up for self (the driver executable)
e0de0af 
The `arguments` is modified by `Driver.invocationRunMode`, so the first
element is no longer the driver itself.
@stevapple
Copy link
Contributor Author

stevapple commented Apr 20, 2022

Question: Why were we replacing the arguments here?

The subsequence is that after replacing /path/to/swift build with swift-build, SwiftPM cannot know its real path, causing tools to be not found.

@stevapple
Pass full path to subcommand executable
f207c2a 
This should fix the problem of SwiftPM and other tools not knowing
where themselves are.
@stevapple
Copy link
Contributor Author

stevapple commented Aug 2, 2022

cc @artemcm

@stevapple
Copy link
Contributor Author

stevapple commented Aug 9, 2022

Ping

@artemcm
Copy link
Contributor

artemcm commented Aug 15, 2022

@swift-ci please test

artemcm
artemcm approved these changes Aug 15, 2022
View reviewed changes
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 looks correct to me, thank you.

@stevapple
Copy link
Contributor Author

stevapple commented Aug 23, 2022

Anyone to merge now?

@stevapple
Copy link
Contributor Author

stevapple commented Sep 11, 2022

Ping again for anyone with access to merge:)

@stevapple stevapple changed the title Fix looking up for self (the driver executable) Fix up self-discovery of Swift Driver and tools Sep 11, 2022
@stevapple
Copy link
Contributor Author

stevapple commented Sep 16, 2022

@artemcm It seems ready for merge now?

@artemcm
Copy link
Contributor

artemcm commented Sep 16, 2022

@swift-ci please test

@artemcm
Copy link
Contributor

artemcm commented Sep 16, 2022

@swift-ci please test Windows platform

1 similar comment
@artemcm
Copy link
Contributor

artemcm commented Sep 19, 2022

@swift-ci please test Windows platform

@artemcm
Copy link
Contributor

artemcm commented Sep 19, 2022 

C:\Users\swift-ci\jenkins\workspace\swift-driver-PR-windows\swift\include\swift/Demangling/Errors.h(23): fatal error C1083: Cannot open include file: 'swift/shims/Visibility.h': No such file or directory

@compnerd does this look familiar?

@compnerd
Copy link
Member

compnerd commented Sep 19, 2022

Yes that seems familiar. swiftlang/llvm-project#5321 should have addressed that. https://ci-external.swift.org/job/oss-swift-windows-toolchain-x86_64-vs2019/ is also green currently.

@artemcm artemcm merged commit 4e924da into swiftlang:main Sep 19, 2022
@artemcm
Copy link
Contributor

artemcm commented Sep 19, 2022

A subsequent build passed. 👍🏼

@stevapple stevapple deleted the find-subcommand branch September 20, 2022 01:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@artemcm artemcm artemcm approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@stevapple @artemcm @compnerd