summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2018-11-20 00:36:24 +0000
committerTom Stellard <tstellar@redhat.com>2018-11-20 00:36:24 +0000
commite3cd69e00b5c8c9c91fe640e7538f4e85436da7d (patch)
tree234142056aee205728e05b8bca34952d89abdc20
parent85e1cc5cd7a65280bf6d0bbdb0036c20f55c1b5f (diff)
downloadbcm5719-llvm-e3cd69e00b5c8c9c91fe640e7538f4e85436da7d.tar.gz
bcm5719-llvm-e3cd69e00b5c8c9c91fe640e7538f4e85436da7d.zip
Merging r341697:
------------------------------------------------------------------------ r341697 | arphaman | 2018-09-07 11:59:45 -0700 (Fri, 07 Sep 2018) | 4 lines warn_stdlibcxx_not_found: suggest '-stdlib=libc++' instead of '-std' Addresses first post-commit feedback for r335081 from Nico ------------------------------------------------------------------------ llvm-svn: 347276
-rw-r--r--clang/include/clang/Basic/DiagnosticFrontendKinds.td2
-rw-r--r--clang/test/Frontend/warning-stdlibcxx-darwin.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/DiagnosticFrontendKinds.td b/clang/include/clang/Basic/DiagnosticFrontendKinds.td
index 66287933b7c..2bf85e0098d 100644
--- a/clang/include/clang/Basic/DiagnosticFrontendKinds.td
+++ b/clang/include/clang/Basic/DiagnosticFrontendKinds.td
@@ -238,7 +238,7 @@ def warn_option_invalid_ocl_version : Warning<
"OpenCL version %0 does not support the option '%1'">, InGroup<Deprecated>;
def warn_stdlibcxx_not_found : Warning<
- "include path for stdlibc++ headers not found; pass '-std=libc++' on the "
+ "include path for stdlibc++ headers not found; pass '-stdlib=libc++' on the "
"command line to use the libc++ standard library instead">,
InGroup<DiagGroup<"stdlibcxx-not-found">>;
}
diff --git a/clang/test/Frontend/warning-stdlibcxx-darwin.cpp b/clang/test/Frontend/warning-stdlibcxx-darwin.cpp
index 3c132b6a833..9f31373be7f 100644
--- a/clang/test/Frontend/warning-stdlibcxx-darwin.cpp
+++ b/clang/test/Frontend/warning-stdlibcxx-darwin.cpp
@@ -1,5 +1,5 @@
// RUN: %clang -cc1 -triple arm64-apple-ios6.0.0 -isysroot %S/doesnotexist %s 2>&1 | FileCheck %s
// RUN: %clang -cc1 -triple arm64-apple-ios6.0.0 -isysroot %S/doesnotexist -stdlib=libc++ %s -verify
-// CHECK: include path for stdlibc++ headers not found; pass '-std=libc++' on the command line to use the libc++ standard library instead
+// CHECK: include path for stdlibc++ headers not found; pass '-stdlib=libc++' on the command line to use the libc++ standard library instead
// expected-no-diagnostics
OpenPOWER on IntegriCloud