diff options
| author | Tim Northover <tnorthover@apple.com> | 2016-02-15 16:38:10 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2016-02-15 16:38:10 +0000 |
| commit | 3a098c1b9fb5e05c2347bc2e081cc3f3adc3e60d (patch) | |
| tree | 92c62822cbf88ffecd1a68bc85d618f7c91c76e5 /clang/lib/Driver/ToolChains.cpp | |
| parent | 04bf43bd838e21710a4a5e6d5cda93caa54c2d85 (diff) | |
| download | bcm5719-llvm-3a098c1b9fb5e05c2347bc2e081cc3f3adc3e60d.tar.gz bcm5719-llvm-3a098c1b9fb5e05c2347bc2e081cc3f3adc3e60d.zip | |
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
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index ae24e4731b7..6c5cdb27597 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -1060,7 +1060,7 @@ DerivedArgList *Darwin::TranslateArgs(const DerivedArgList &Args, } 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++"); |
