Skip to content

Legacy Driver: Make --ld-path option consistently use single dash #68495

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
Sep 15, 2023

Conversation

MaxDesiatov
Copy link
Contributor

The original --ld-path option hasn't been included in a released version yet, so it's ok to break.
The vast majority of other options on Swift Driver already use a single dash.

The vast majority of other options on Swift Driver already use a single dash.
@MaxDesiatov MaxDesiatov added legacy driver Area → compiler: the integrated C++ legacy driver. Succeeded by the swift-driver project driver options Area → compiler → legacy driver: driver options labels Sep 13, 2023
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci build toolchain

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Thanks!

kabiroberai added a commit to kabiroberai/swift-package-manager that referenced this pull request Sep 14, 2023
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test windows

@MaxDesiatov
Copy link
Contributor Author

@swift-ci build toolchain Windows

@compnerd
Copy link
Member

The Windows toolchain issue is unrelated to this change:

     C:\Users\swift-ci\jenkins\workspace\swift-PR-build-toolchain-windows\swift-installer-scripts\platforms\Windows\dbg\dbg.wxs(43): error WIX0103: Cannot find the File file 'T:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib\site-packages\lldb\_lldb.pyd'. The following paths were checked: T:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib\site-packages\lldb\_lldb.pyd [C:\Users\swift-ci\jenkins\workspace\swift-PR-build-toolchain-windows\swift-installer-scripts\platforms\Windows\dbg\dbg.wixproj]

It seems that we need to tweak a few things.

@compnerd
Copy link
Member

@swift-ci please build toolchain Windows platform

@MaxDesiatov MaxDesiatov merged commit 2d37e5b into main Sep 15, 2023
@MaxDesiatov MaxDesiatov deleted the maxd/ld-path-dash branch September 15, 2023 09:57
@MaxDesiatov MaxDesiatov restored the maxd/ld-path-dash branch September 15, 2023 09:57
MaxDesiatov pushed a commit to swiftlang/swift-package-manager that referenced this pull request Sep 19, 2023
This PR implements support for the `linker.path` field in the Swift SDK toolset spec.

Depends on swiftlang/swift#68495 and swiftlang/swift-driver#1441.

### Motivation:

This field was previously parsed but not respected.

### Modifications:

Add `-ld-path=\(linker.path)` to the toolchain's Swift flags if a linker path override is supplied

### Result:

The linker path is now respected.
MaxDesiatov pushed a commit to swiftlang/swift-package-manager that referenced this pull request Sep 28, 2023
This PR implements support for the `linker.path` field in the Swift SDK toolset spec.

Depends on swiftlang/swift#68495 and swiftlang/swift-driver#1441.

### Motivation:

This field was previously parsed but not respected.

### Modifications:

Add `-ld-path=\(linker.path)` to the toolchain's Swift flags if a linker path override is supplied

### Result:

The linker path is now respected.
MaxDesiatov pushed a commit to swiftlang/swift-package-manager that referenced this pull request Sep 28, 2023
This PR implements support for the `linker.path` field in the Swift SDK toolset spec.

Depends on swiftlang/swift#68495 and swiftlang/swift-driver#1441.

### Motivation:

This field was previously parsed but not respected.

### Modifications:

Add `-ld-path=\(linker.path)` to the toolchain's Swift flags if a linker path override is supplied

### Result:

The linker path is now respected.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
driver options Area → compiler → legacy driver: driver options legacy driver Area → compiler: the integrated C++ legacy driver. Succeeded by the swift-driver project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants