[all-commits] [llvm/llvm-project] bab984: Reland 198fbcb8, "Driver: Don't look for libc++ he...

pcc via All-commits all-commits at lists.llvm.org
Mon Dec 9 10:08:11 PST 2019


  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: bab9849963eb9b9f1fa03900e8c48a7c7d6fc305
      https://github.com/llvm/llvm-project/commit/bab9849963eb9b9f1fa03900e8c48a7c7d6fc305
  Author: Peter Collingbourne <peter at pcc.me.uk>
  Date:   2019-12-09 (Mon, 09 Dec 2019)

  Changed paths:
    M clang/lib/Driver/ToolChains/Linux.cpp
    A clang/test/Driver/android-no-installed-libcxx.cpp
    M clang/test/Driver/stdlibxx-isystem.cpp

  Log Message:
  -----------
  Reland 198fbcb8, "Driver: Don't look for libc++ headers in the install directory on Android.", which was reverted in b3249027.

Fixed the test case to set --sysroot, which lets it succeed in the case where
a directory named "/usr/include/c++/v1" or "/usr/local/include/c++/v1" exists.

Original commit message:
> The NDK uses a separate set of libc++ headers in the sysroot. Any headers
> in the installation directory are not going to work on Android, not least
> because they use a different name for the inline namespace (std::__1 instead
> of std::__ndk1).
>
> This effectively makes it impossible to produce a single toolchain that is
> capable of targeting both Android and another platform that expects libc++
> headers to be installed in the installation directory, such as Mac.
>
> In order to allow this scenario to work, stop looking for headers in the
> install directory on Android.

Differential Revision: https://reviews.llvm.org/D71154




More information about the All-commits mailing list