diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-04-12 23:21:25 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-04-12 23:21:25 +0000 |
| commit | ac65f642a5a37c1cfd3ce3177ca9f4779514f399 (patch) | |
| tree | 564433e381b2d2a816469ffaf3ec05ecead476d7 /clang/lib | |
| parent | 4e1ec636e1c3c9168f9c265788b2d7d9f27e58fe (diff) | |
| download | bcm5719-llvm-ac65f642a5a37c1cfd3ce3177ca9f4779514f399.tar.gz bcm5719-llvm-ac65f642a5a37c1cfd3ce3177ca9f4779514f399.zip | |
Update to match LLVM r300135.
Remove "REQUIRES: long_tests" from test/Driver/response-file.c since it is now about 10x faster. (We can add that back if it's still too slow for some buildbot.)
llvm-svn: 300136
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/ToolChains/Darwin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index 6952f455167..009a12da301 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -1684,7 +1684,8 @@ Darwin::TranslateArgs(const DerivedArgList &Args, StringRef BoundArch, A = *it; assert(A->getOption().getID() == options::OPT_static && "missing expected -static argument"); - it = DAL->getArgs().erase(it); + *it = nullptr; + ++it; } } |
