Skip to content

Conversation

bnbarham
Copy link
Contributor

Squashed cherry-pick of #68334 and #68743.

@bnbarham bnbarham requested a review from a team as a code owner September 29, 2023 04:31
@bnbarham bnbarham added 🍒 release cherry pick Flag: Release branch cherry picks swift 5.9 labels Sep 29, 2023
@bnbarham
Copy link
Contributor Author

@bnbarham
Copy link
Contributor Author

@bnbarham
Copy link
Contributor Author

Somehow missed 2227f8e, though it's really not clear to me how that is the case.

@bnbarham
Copy link
Contributor Author

@bnbarham bnbarham changed the base branch from release/5.9.0 to release/5.9.1 September 29, 2023 21:39
@bnbarham
Copy link
Contributor Author

@DougGregor DougGregor merged commit 255f28a into swiftlang:release/5.9.1 Oct 3, 2023
@bnbarham bnbarham deleted the 591-macros branch October 3, 2023 18:50
al45tair added a commit to al45tair/swift that referenced this pull request Oct 5, 2023
Somehow swiftlang#68858 managed to remove `config.swift_host_lib_dir` without
removing the corresponding `config.substitutions.append`.  Fix.

rdar://116112040
@al45tair
Copy link
Contributor

al45tair commented Oct 5, 2023

FWIW, this was missing a line somehow; it should have removed

config.substitutions.append( ('%swift-host-lib-dir', config.swift_host_lib_dir))

from lit.cfg.

Fixing here: #68988 efbf21a

@bnbarham
Copy link
Contributor Author

bnbarham commented Oct 5, 2023

Ah, thanks. Beat me to it :). I assume I must have kept both when I was fixing a merge conflict, which I'm still very confused about. #68904 doesn't show the %swift-plugin-dir removal, but it definitely was (see 9dbdd5e)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍒 release cherry pick Flag: Release branch cherry picks swift 5.9
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants