summaryrefslogtreecommitdiffstats
path: root/clang/test/Driver/darwin-stdlib.cpp
diff options
context:
space:
mode:
authorIlya Biryukov <ibiryukov@google.com>2019-01-09 13:08:11 +0000
committerIlya Biryukov <ibiryukov@google.com>2019-01-09 13:08:11 +0000
commit87aaa56b426bd22c3633679115dc29ca042d4fff (patch)
tree3956a9eccbcfc5d9052007405810665b4b8684fc /clang/test/Driver/darwin-stdlib.cpp
parentb7a8ab3417bec834876a9ced6448223b5f140b45 (diff)
downloadbcm5719-llvm-87aaa56b426bd22c3633679115dc29ca042d4fff.tar.gz
bcm5719-llvm-87aaa56b426bd22c3633679115dc29ca042d4fff.zip
[Driver] Fix libcxx detection on Darwin with clang run as ./clang
Summary: By using '..' instead of fs::parent_path. The intention of the code was to go from 'path/to/clang/bin' to 'path/to/clang/include'. In most cases parent_path works, however it would fail when clang is run as './clang'. This was noticed in Chromium's bug tracker, see https://bugs.chromium.org/p/chromium/issues/detail?id=919761 Reviewers: arphaman, thakis, EricWF Reviewed By: arphaman, thakis Subscribers: christof, cfe-commits Differential Revision: https://reviews.llvm.org/D56446 llvm-svn: 350714
Diffstat (limited to 'clang/test/Driver/darwin-stdlib.cpp')
-rw-r--r--clang/test/Driver/darwin-stdlib.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/Driver/darwin-stdlib.cpp b/clang/test/Driver/darwin-stdlib.cpp
index 3da92a26ee5..3e89bd1ec99 100644
--- a/clang/test/Driver/darwin-stdlib.cpp
+++ b/clang/test/Driver/darwin-stdlib.cpp
@@ -14,7 +14,7 @@
// optional absolute include for libc++ from InitHeaderSearch.cpp also fires.
// CHECK-LIBCXX: "-stdlib=libc++"
-// CHECK-LIBCXX: "-internal-isystem" "{{[^"]*}}{{/|\\\\}}Inputs{{/|\\\\}}darwin_toolchain_tree{{/|\\\\}}bin{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"
+// CHECK-LIBCXX: "-internal-isystem" "{{[^"]*}}{{/|\\\\}}Inputs{{/|\\\\}}darwin_toolchain_tree{{/|\\\\}}bin{{/|\\\\}}..{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"
// CHECK-LIBSTDCXX-NOT: -stdlib=libc++
// CHECK-LIBSTDCXX-NOT: -stdlib=libstdc++
OpenPOWER on IntegriCloud