commit 3a098c1b9fb5e05c2347bc2e081cc3f3adc3e60d
author Tim Northover <tnorthover@apple.com> Mon Feb 15 16:38:10 2016 +0000
committer Tim Northover <tnorthover@apple.com> Mon Feb 15 16:38:10 2016 +0000
tree 92c62822cbf88ffecd1a68bc85d618f7c91c76e5
parent 04bf43bd838e21710a4a5e6d5cda93caa54c2d85

Darwin: fix stdlib handling when CLANG_DEFAULT_STDLIB is set

I'd accidentally skipped the CMake check in a premature optimisation. I'd also
put the original test in completely the wrong place.

Thanks Jonas Hahnfeld!

llvm-svn: 260898

clang/lib/Driver/ToolChains.cpp

diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index ae24e47..6c5cdb2 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -1060,7 +1060,7 @@
   }
 
   if (!Args.getLastArg(options::OPT_stdlib_EQ) &&
-      GetDefaultCXXStdlibType() == ToolChain::CST_Libcxx)
+      GetCXXStdlibType(Args) == ToolChain::CST_Libcxx)
     DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_stdlib_EQ),
                       "libc++");