Page MenuHomePhabricator

[libc++] Don't override LIBCXX_CXX_ABI_INCLUDE_PATHS for libcxxrt
ClosedPublic

Authored by arichardson on Jun 18 2020, 7:05 AM.

Details

Summary

When testing libc++ for our cross-compiled CheriBSD target we specify an
explicit LIBCXX_CXX_ABI_INCLUDE_PATHS for libcxxrt. The hardcoded path
/usr/include/c++/v1 was introduced in 61e89737c5daf7b65341936f88f68efb680cdcd4
and overrides any value passed on the CMake command line. Fix this by using
it as a fallback rather than a fixed default value.

Diff Detail

Event Timeline

arichardson created this revision.Jun 18 2020, 7:05 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 18 2020, 7:05 AM
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald Transcript
ldionne requested changes to this revision.Jun 18 2020, 7:48 AM

Can you also please make the change for the elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi") case?

This revision now requires changes to proceed.Jun 18 2020, 7:48 AM

Handle the other branch

ldionne accepted this revision.Jun 18 2020, 8:54 AM
This revision is now accepted and ready to land.Jun 18 2020, 8:54 AM
This revision was automatically updated to reflect the committed changes.