[llvm-branch-commits] [cfe-branch] r347276 - Merging r341697:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Mon Nov 19 16:36:24 2018
New Revision: 347276

URL: http://llvm.org/viewvc/llvm-project?rev=347276&view=rev
Log:
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

------------------------------------------------------------------------

Modified:
    cfe/branches/release_70/include/clang/Basic/DiagnosticFrontendKinds.td
    cfe/branches/release_70/test/Frontend/warning-stdlibcxx-darwin.cpp

Modified: cfe/branches/release_70/include/clang/Basic/DiagnosticFrontendKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/include/clang/Basic/DiagnosticFrontendKinds.td?rev=347276&r1=347275&r2=347276&view=diff
==============================================================================
--- cfe/branches/release_70/include/clang/Basic/DiagnosticFrontendKinds.td (original)
+++ cfe/branches/release_70/include/clang/Basic/DiagnosticFrontendKinds.td Mon Nov 19 16:36:24 2018
@@ -238,7 +238,7 @@ def warn_option_invalid_ocl_version : Wa
   "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">>;
 }

Modified: cfe/branches/release_70/test/Frontend/warning-stdlibcxx-darwin.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/test/Frontend/warning-stdlibcxx-darwin.cpp?rev=347276&r1=347275&r2=347276&view=diff
==============================================================================
--- cfe/branches/release_70/test/Frontend/warning-stdlibcxx-darwin.cpp (original)
+++ cfe/branches/release_70/test/Frontend/warning-stdlibcxx-darwin.cpp Mon Nov 19 16:36:24 2018
@@ -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