This is an archive of the discontinued LLVM Phabricator instance.

Differential D141345

[libc++] Remove warning for `LIBCXX_SYSROOT`, `LIBCXX_TARGET_TRIPLE`, and `LIBCXX_GCC_TOOLCHAIN`
ClosedPublic

Authored by jloser on Jan 9 2023, 7:16 PM.

Details

Reviewers
ldionne
philnik
Group Reviewers
Restricted Project
Commits
rG07a341c2e4d9: [libc++] Remove warning for `LIBCXX_SYSROOT`, `LIBCXX_TARGET_TRIPLE`, and…
Summary

Support for these CMake variables has been a warning for a while now. The
comment indicates to just remove the warning message entirely as anyone impacted
had to have update to new mechanisms in order to use libc++. So, remove the
warning message.

Diff Detail

Unit TestsFailed

TimeTest
9,730 mslibcxx CI UBSAN > llvm-libc++-shared-cfg-in.libcxx::clang_query.sh.cpp
10,040 mslibcxx CI Unstable ABI > llvm-libc++-shared-cfg-in.libcxx::clang_query.sh.cpp

Event Timeline

jloser created this revision.Jan 9 2023, 7:16 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 9 2023, 7:16 PM
jloser requested review of this revision.Jan 9 2023, 7:16 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 9 2023, 7:16 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
philnik accepted this revision as: philnik.Jan 9 2023, 7:36 PM
philnik added a subscriber: philnik.

LGTM, but let's see if anybody else has any comments. We should definitely get better at working through the TODO LLVM <version>s.

jloser added a comment.Jan 9 2023, 8:10 PM
In D141345#4038479, @philnik wrote:

LGTM, but let's see if anybody else has any comments. We should definitely get better at working through the TODO LLVM <version>s.

Agreed. I'm in no rush to ship this, but it would be good to do it before we cut the LLVM 16 release soon (1/23 I think?)

Harbormaster completed remote builds in B206677: Diff 487641.Jan 9 2023, 9:05 PM
ldionne accepted this revision.Jan 10 2023, 10:06 AM

Nice catch, thanks!

The CI needs a bit of love right now but I think none of the failures are related.

This revision is now accepted and ready to land.Jan 10 2023, 10:06 AM
This revision was landed with ongoing or failed builds.Jan 10 2023, 12:07 PM
Closed by commit rG07a341c2e4d9: [libc++] Remove warning for `LIBCXX_SYSROOT`, `LIBCXX_TARGET_TRIPLE`, and… (authored by jloser). · Explain Why
This revision was automatically updated to reflect the committed changes.
jloser added a commit: rG07a341c2e4d9: [libc++] Remove warning for `LIBCXX_SYSROOT`, `LIBCXX_TARGET_TRIPLE`, and….

Revision Contents

PathSize
libcxx/
5 lines

Diff 487641

libcxx/CMakeLists.txt

Show First 20 Lines • Show All 263 Lines • ▼ Show 20 Lines
option(LIBCXXABI_USE_LLVM_UNWINDER "Build and use the LLVM unwinder." OFF) option(LIBCXXABI_USE_LLVM_UNWINDER "Build and use the LLVM unwinder." OFF)
# Target options -------------------------------------------------------------- # Target options --------------------------------------------------------------
option(LIBCXX_BUILD_32_BITS "Build 32 bit multilib libc++. This option is not supported anymore when building the runtimes. Please specify a full triple instead." ${LLVM_BUILD_32_BITS}) option(LIBCXX_BUILD_32_BITS "Build 32 bit multilib libc++. This option is not supported anymore when building the runtimes. Please specify a full triple instead." ${LLVM_BUILD_32_BITS})
if (LIBCXX_BUILD_32_BITS) if (LIBCXX_BUILD_32_BITS)
message(FATAL_ERROR "LIBCXX_BUILD_32_BITS is not supported anymore when building the runtimes, please specify a full triple instead.") message(FATAL_ERROR "LIBCXX_BUILD_32_BITS is not supported anymore when building the runtimes, please specify a full triple instead.")
endif() endif()
# TODO: Remove this after branching for LLVM 15
if(LIBCXX_SYSROOT OR LIBCXX_TARGET_TRIPLE OR LIBCXX_GCC_TOOLCHAIN)
message(WARNING "LIBCXX_SYSROOT, LIBCXX_TARGET_TRIPLE and LIBCXX_GCC_TOOLCHAIN are not supported anymore, please use the native CMake equivalents instead")
endif()
# Feature options ------------------------------------------------------------- # Feature options -------------------------------------------------------------
option(LIBCXX_ENABLE_EXCEPTIONS "Use exceptions." ON) option(LIBCXX_ENABLE_EXCEPTIONS "Use exceptions." ON)
option(LIBCXX_ENABLE_RTTI "Use run time type information." ON) option(LIBCXX_ENABLE_RTTI "Use run time type information." ON)
option(LIBCXX_ENABLE_THREADS "Build libc++ with support for threads." ON) option(LIBCXX_ENABLE_THREADS "Build libc++ with support for threads." ON)
option(LIBCXX_ENABLE_MONOTONIC_CLOCK option(LIBCXX_ENABLE_MONOTONIC_CLOCK
"Build libc++ with support for a monotonic clock. "Build libc++ with support for a monotonic clock.
This option may only be set to OFF when LIBCXX_ENABLE_THREADS=OFF." ON) This option may only be set to OFF when LIBCXX_ENABLE_THREADS=OFF." ON)
option(LIBCXX_HAS_MUSL_LIBC "Build libc++ with support for the Musl C library" OFF) option(LIBCXX_HAS_MUSL_LIBC "Build libc++ with support for the Musl C library" OFF)
▲ Show 20 Lines • Show All 663 Lines • Show Last 20 Lines