[PATCH] D71154: Driver: Don't look for libc++ headers in the install directory on Android.

Dan Albert via Phabricator via cfe-commits cfe-commits at lists.llvm.org
Fri Dec 6 17:11:49 PST 2019


danalbert accepted this revision.
danalbert added inline comments.
This revision is now accepted and ready to land.


================
Comment at: clang/test/Driver/android-no-installed-libcxx.cpp:8
+// RUN:   -stdlib=libc++ -fsyntax-only %s -### 2>&1 | FileCheck %s
+// CHECK-NOT: "-internal-isystem" "{{.*}}v1"
----------------
pcc wrote:
> danalbert wrote:
> > This looks like it should be failing. The NDK headers are installed to `<NDK>/sysroot/usr/include/c++/v1`. Presumably it's passing because the trivial sysroot in the test directory is not complete enough?
> > 
> > Will need a more specific CHECK-NOT here, and also a CHECK to make sure the correct directory is being searched.
> The `%t/include/c++/v1` path here represents the install directory, not the sysroot. Note that the test isn't passing a `-sysroot` flag.
> 
> We already have a test that the correct directory is being searched, see `test/Driver/android-ndk-standalone.cpp`.
Ah, I'd forgotten that the tests required an explicit `--sysroot` flag. That's not required for a typical NDK clang call, but it is here. Never mind then, this LGTM.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D71154/new/

https://reviews.llvm.org/D71154





More information about the cfe-commits mailing list