[cxx-interop] Extract libstdc++ installation path from Clang #58962
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
egorzhdan
added a commit
to swiftlang/llvm-project
that referenced
this pull request
May 18, 2022
… Clang See swiftlang/swift#58962 for details. rdar://93341210
To inject a modulemap into the libstdc++ directory, Swift needs to know the path of the libstdc++ installation. Previously it was assumed to be `/usr/include/c++/{version}`, however, this might not be the case. For example, on CentOS the stdlib is located at `/opt/rh/devtoolset-{version}/root/usr/include/c++/{version}`.
This change teaches Swift to extract the libstdc++ include paths from the Clang driver, and fixes C++ stdlib lookup on CentOS.
rdar://93341210
egorzhdan
force-pushed
the
egorzhdan/libstdcxx-path
branch
from
e8d6a67 to
abf56bc
Compare
|
@swift-ci please smoke test |
egorzhdan
added a commit
to swiftlang/llvm-project
that referenced
this pull request
May 19, 2022
… Clang See swiftlang/swift#58962 for details. rdar://93341210
|
I think this pull broke several tests on the Android CI, as many now report this new warning (13 of those 31 were already failing for unrelated reasons before). This change will probably need to be modified for the Android NDK, which doesn't use a standard toolchain layout of |
|
Hmm, since Android uses libc++, this logic shouldn't run. Submitted #59156. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To inject a modulemap into the libstdc++ directory, Swift needs to know the path of the libstdc++ installation. Previously it was assumed to be
/usr/include/c++, however, this might not be the case. For example, on CentOS the stdlib is located at/opt/rh/devtoolset-{version}/root/usr/include/c++/{version}.This change teaches Swift to extract the libstdc++ include paths from the Clang driver, and fixes C++ stdlib lookup on CentOS.
rdar://93341210