r276618 - Update description for CLANG_DEFAULT_CXX_STDLIB and add comment. NFC

[Jonas Hahnfeld via cfe-commits]

Author: hahnfeld
Date: Mon Jul 25 03:04:26 2016
New Revision: 276618

URL: http://llvm.org/viewvc/llvm-project?rev=276618&view=rev
Log:
Update description for CLANG_DEFAULT_CXX_STDLIB and add comment. NFC

We agreed to call it "platform default" instead of "architecture default".
(see D17286)

Modified:
    cfe/trunk/CMakeLists.txt
    cfe/trunk/lib/Driver/ToolChain.cpp

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=276618&r1=276617&r2=276618&view=diff
==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Mon Jul 25 03:04:26 2016
@@ -193,11 +193,11 @@ set(ENABLE_X86_RELAX_RELOCATIONS OFF CAC
     "enable x86 relax relocations by default")
 
 set(CLANG_DEFAULT_CXX_STDLIB "" CACHE STRING
-  "Default C++ stdlib to use (empty for architecture default, \"libstdc++\" or \"libc++\"")
+  "Default C++ stdlib to use (empty for platform default, \"libstdc++\" or \"libc++\"")
 if (NOT(CLANG_DEFAULT_CXX_STDLIB STREQUAL "" OR
         CLANG_DEFAULT_CXX_STDLIB STREQUAL "libstdc++" OR
         CLANG_DEFAULT_CXX_STDLIB STREQUAL "libc++"))
-  message(WARNING "Resetting default C++ stdlib to use architecture default")
+  message(WARNING "Resetting default C++ stdlib to use platform default")
   set(CLANG_DEFAULT_CXX_STDLIB "")
 endif()
 

Modified: cfe/trunk/lib/Driver/ToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChain.cpp?rev=276618&r1=276617&r2=276618&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChain.cpp Mon Jul 25 03:04:26 2016
@@ -577,6 +577,8 @@ ToolChain::CXXStdlibType ToolChain::GetC
         << A->getAsString(Args);
   }
 
+  // If no argument was provided or its value was invalid, look for the
+  // default unless forced or configured to take the platform default.
   if (!HasValidType && (ForcePlatformDefault ||
       !ParseCXXStdlibType(CLANG_DEFAULT_CXX_STDLIB, Type)))
     Type = GetDefaultCXXStdlibType();