Skip to content

[cmake] Modify libedit target name to match LLVM's FindLibEdit#64193

Merged
swift-ci merged 1 commit into
swiftlang:mainfrom
drodriguez:libedit-cmake
Mar 8, 2023
Merged

[cmake] Modify libedit target name to match LLVM's FindLibEdit#64193
swift-ci merged 1 commit into
swiftlang:mainfrom
drodriguez:libedit-cmake

Conversation

@drodriguez
Copy link
Copy Markdown
Contributor

For unified builds, LLVM with the update to stable/20221013 includes its own FindLibEdit, which shares many of the same names than Swift's FindLibEdit, except that they differ in the target name.

Match both LLVM and Swift target names, so unified builds can find LibEdit::LibEdit correctly and not try to link against libedit mistakenly.

This should not affect Darwin/Linux builds from upstream Swift, since they build non-unified in most people setups (including CI).

/cc @compnerd, you created the original FindLibEdit.cmake in #29404.

https://reviews.llvm.org/D124673 is the LLVM review that added FindLibEdit.cmake in their repository. It was not in stable/20220421, but it is in stable/20221013.

For unified builds, LLVM with the update to stable/20221013 includes its
own FindLibEdit, which shares many of the same names than Swift's
FindLibEdit, except that they differ in the target name.

Match both LLVM and Swift target names, so unified builds can find
LibEdit::LibEdit correctly and not try to link against libedit
mistakenly.

This should not affect Darwin/Linux builds from upstream Swift, since
they build non-unified in most people setups (including CI).
@drodriguez drodriguez requested a review from compnerd March 8, 2023 01:13
@drodriguez
Copy link
Copy Markdown
Contributor Author

@swift-ci please test and merge

@swift-ci swift-ci merged commit 5e1f304 into swiftlang:main Mar 8, 2023
@compnerd
Copy link
Copy Markdown
Member

compnerd commented Mar 8, 2023

Thanks!

@drodriguez drodriguez deleted the libedit-cmake branch March 8, 2023 16:34
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.

3 participants