This is an archive of the discontinued LLVM Phabricator instance.

Differential D127257

[libcxx] improve LIBCXX_ABI_NAMESPACE error message
ClosedPublic

Authored by fmayer on Jun 7 2022, 3:26 PM.

Details

Reviewers
jloser
ldionne
Group Reviewers
Restricted Project
Commits
rGd7e438c016e5: [libcxx] improve LIBCXX_ABI_NAMESPACE error message
Summary

include the invalid LIBCXX_ABI_NAMESPACE to ease debugging.

Diff Detail

Event Timeline

fmayer created this revision.Jun 7 2022, 3:26 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 7 2022, 3:26 PM
Herald added a subscriber: mgorny. · View Herald Transcript
fmayer requested review of this revision.Jun 7 2022, 3:26 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 7 2022, 3:26 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
fmayer updated this revision to Diff 434973.Jun 7 2022, 3:34 PM

Consistency

jloser accepted this revision.Jun 7 2022, 3:46 PM
Harbormaster completed remote builds in B168424: Diff 434973.Jun 7 2022, 7:22 PM
ldionne accepted this revision.Jun 9 2022, 8:39 AM
ldionne added a subscriber: ldionne.
ldionne added inline comments.
libcxx/CMakeLists.txt
190
This revision is now accepted and ready to land.Jun 9 2022, 8:39 AM
Closed by commit rGd7e438c016e5: [libcxx] improve LIBCXX_ABI_NAMESPACE error message (authored by fmayer). · Explain WhyJun 9 2022, 8:48 AM
This revision was automatically updated to reflect the committed changes.
fmayer added a commit: rGd7e438c016e5: [libcxx] improve LIBCXX_ABI_NAMESPACE error message.
fmayer added inline comments.Jun 9 2022, 8:50 AM
libcxx/CMakeLists.txt
190

Ah sorry, I missed this. Submitted rG4110c2c657b329f91a5c4eef653a15c1a15b61ed.

Revision Contents

PathSize
libcxx/
2 lines

Diff 434970

libcxx/CMakeLists.txt

Show First 20 Lines • Show All 181 Lines • ▼ Show 20 Linesset(LIBCXX_ABI_VERSION "${abi_version}" CACHE STRING
Defaults to 1 unless LIBCXX_ABI_UNSTABLE is specified, in which case this is 2.") Defaults to 1 unless LIBCXX_ABI_UNSTABLE is specified, in which case this is 2.")
set(LIBCXX_LIBRARY_VERSION "${LIBCXX_ABI_VERSION}.0" CACHE STRING set(LIBCXX_LIBRARY_VERSION "${LIBCXX_ABI_VERSION}.0" CACHE STRING
"Version of libc++. This will be reflected in the name of the shared library produced. "Version of libc++. This will be reflected in the name of the shared library produced.
For example, -DLIBCXX_LIBRARY_VERSION=x.y will result in the library being named For example, -DLIBCXX_LIBRARY_VERSION=x.y will result in the library being named
libc++.x.y.dylib, along with the usual symlinks pointing to that. On Apple platforms, libc++.x.y.dylib, along with the usual symlinks pointing to that. On Apple platforms,
this also controls the linker's 'current_version' property.") this also controls the linker's 'current_version' property.")
set(LIBCXX_ABI_NAMESPACE "__${LIBCXX_ABI_VERSION}" CACHE STRING "The inline ABI namespace used by libc++. It defaults to __n where `n` is the current ABI version.") set(LIBCXX_ABI_NAMESPACE "__${LIBCXX_ABI_VERSION}" CACHE STRING "The inline ABI namespace used by libc++. It defaults to __n where `n` is the current ABI version.")
if (NOT LIBCXX_ABI_NAMESPACE MATCHES "__.*") if (NOT LIBCXX_ABI_NAMESPACE MATCHES "__.*")
message(FATAL_ERROR "LIBCXX_ABI_NAMESPACE must be a reserved identifier.") message(FATAL_ERROR "LIBCXX_ABI_NAMESPACE must be a reserved identifier, is \"${LIBCXX_ABI_NAMESPACE}\".")
ldionneUnsubmitted
Not Done
ReplyInline Actions
if (NOT LIBCXX_ABI_NAMESPACE MATCHES "__.*")
- message(FATAL_ERROR "LIBCXX_ABI_NAMESPACE must be a reserved identifier, is '${LIBCXX_ABI_NAMESPACE}'.")
+ message(FATAL_ERROR "LIBCXX_ABI_NAMESPACE must be a reserved identifier, got '${LIBCXX_ABI_NAMESPACE}'.")
endif()
ldionne:
fmayerAuthorUnsubmitted
Done
ReplyInline Actions

Ah sorry, I missed this. Submitted rG4110c2c657b329f91a5c4eef653a15c1a15b61ed.

fmayer: Ah sorry, I missed this. Submitted rG4110c2c657b329f91a5c4eef653a15c1a15b61ed.
endif() endif()
option(LIBCXX_ABI_FORCE_ITANIUM "Ignore auto-detection and force use of the Itanium ABI.") option(LIBCXX_ABI_FORCE_ITANIUM "Ignore auto-detection and force use of the Itanium ABI.")
option(LIBCXX_ABI_FORCE_MICROSOFT "Ignore auto-detection and force use of the Microsoft ABI.") option(LIBCXX_ABI_FORCE_MICROSOFT "Ignore auto-detection and force use of the Microsoft ABI.")
set(LIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION "default" CACHE STRING set(LIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION "default" CACHE STRING
"Override the implementation to use for comparing typeinfos. By default, this "Override the implementation to use for comparing typeinfos. By default, this
is detected automatically by the library, but this option allows overriding is detected automatically by the library, but this option allows overriding
which implementation is used unconditionally. which implementation is used unconditionally.
▲ Show 20 Lines • Show All 753 Lines • Show Last 20 Lines